diff --git a/CMakeLists.txt b/CMakeLists.txt
index fee2ec2117..5b3cafdc25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,5 +91,9 @@ endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins")
 #-------------------------------------------------------------------------------
 # Install some files to ease package creation
 if(PACKAGE_MODE)
-    INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION ${GAMEINDEX_DIR})
+    INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}")
+    INSTALL(FILES "${PROJECT_SOURCE_DIR}/linux_various/pcsx2.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+    INSTALL(FILES "${PROJECT_SOURCE_DIR}/linux_various/pcsx2.xpm" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps")
+    INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/docs/PCSX2_FAQ_0.9.8.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")
+    INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/docs/PCSX2_Readme_0.9.8.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")
 endif(PACKAGE_MODE)
diff --git a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
index 0c8af50fdb..f8bd4e5fbe 100755
--- a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
+++ b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
@@ -106,7 +106,7 @@ mkdir -p $ROOT_DIR;
 (cd $ROOT_DIR; 
     get_svn_file CMakeLists.txt;
     get_svn_dir common cmake locales pcsx2 tools;
-    get_svn_dir debian-unstable-upstream;
+    get_svn_dir debian-unstable-upstream linux_various;
 echo "Done")
 
 # separate bin to avoid downloading the .mo file
diff --git a/debian-unstable-upstream/pcsx2-unstable.docs b/debian-unstable-upstream/pcsx2-unstable.docs
new file mode 100644
index 0000000000..6f4c9c160f
--- /dev/null
+++ b/debian-unstable-upstream/pcsx2-unstable.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/pcsx2
diff --git a/debian-unstable-upstream/pcsx2-unstable.install b/debian-unstable-upstream/pcsx2-unstable.install
index a2ab6ffff2..28bfbb78a5 100644
--- a/debian-unstable-upstream/pcsx2-unstable.install
+++ b/debian-unstable-upstream/pcsx2-unstable.install
@@ -1,4 +1,4 @@
 usr/bin/pcsx2
-debian/pcsx2.desktop usr/share/applications
-debian/pcsx2.xpm usr/share/pixmaps
+usr/share/applications/pcsx2.desktop
+usr/share/pixmaps/pcsx2.xpm
 var/games/pcsx2
diff --git a/detect_missing_file_in_cmake.sh b/linux_various/detect_missing_file_in_cmake.sh
similarity index 100%
rename from detect_missing_file_in_cmake.sh
rename to linux_various/detect_missing_file_in_cmake.sh
diff --git a/generate_pot.sh b/linux_various/generate_pot.sh
similarity index 100%
rename from generate_pot.sh
rename to linux_various/generate_pot.sh
diff --git a/debian-unstable-upstream/pcsx2.desktop b/linux_various/pcsx2.desktop
similarity index 100%
rename from debian-unstable-upstream/pcsx2.desktop
rename to linux_various/pcsx2.desktop
diff --git a/debian-unstable-upstream/pcsx2.xpm b/linux_various/pcsx2.xpm
similarity index 100%
rename from debian-unstable-upstream/pcsx2.xpm
rename to linux_various/pcsx2.xpm
diff --git a/plugins/zerospu2/CMakeLists.txt b/plugins/zerospu2/CMakeLists.txt
index c72f4db79a..eb8257481d 100644
--- a/plugins/zerospu2/CMakeLists.txt
+++ b/plugins/zerospu2/CMakeLists.txt
@@ -94,10 +94,6 @@ add_library(${Output} SHARED
 			${zerospu2LinuxSources}
 			${zerospu2LinuxHeaders})
 
-# set output directory
-set_target_properties(${Output} PROPERTIES
-					  LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
-
 # link target with ALSA
 target_link_libraries(${Output} ${ALSA_LIBRARIES})
 
@@ -113,3 +109,9 @@ target_link_libraries(${Output} ${SOUNDTOUCH_LIBRARIES})
 if(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
     target_link_libraries(${Output} "${USER_CMAKE_LD_FLAGS}")
 endif(NOT USER_CMAKE_LD_FLAGS STREQUAL "")
+
+if(PACKAGE_MODE)
+    install(TARGETS ${Output} DESTINATION ${PLUGIN_DIR})
+else(PACKAGE_MODE)
+    install(TARGETS ${Output} DESTINATION ${CMAKE_SOURCE_DIR}/bin/plugins)
+endif(PACKAGE_MODE)