diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 199c045..05b546c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,7 +130,6 @@ macro (mraa_CREATE_INSTALL_PKGCONFIG generated_file install_location)
   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location})
 endmacro (mraa_CREATE_INSTALL_PKGCONFIG)
 mraa_create_install_pkgconfig (mraa.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-mraa_create_install_pkgconfig (mraajava.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 install(TARGETS mraa DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt
index c8b0056..1df9cb1 100644
--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -41,12 +41,12 @@ if (DOXYGEN_FOUND)
   endforeach ()
 endif ()
 
+mraa_create_install_pkgconfig (mraajava.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libmraajava.so
+               ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar
 		DESTINATION lib/java
 )
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/../libmraajava.so
 		DESTINATION lib/
 )
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/mraa.jar
-		DESTINATION lib/java
-)
diff --git a/src/mraajava.pc.cmake b/src/java/mraajava.pc.cmake
similarity index 100%
rename from src/mraajava.pc.cmake
rename to src/java/mraajava.pc.cmake