diff --git a/debian-unstable-upstream/control b/debian-unstable-upstream/control
index c7b1cff9b0..a4e9c286d9 100644
--- a/debian-unstable-upstream/control
+++ b/debian-unstable-upstream/control
@@ -42,7 +42,7 @@ Conflicts: pcsx2,
 Replaces: pcsx2-data-unstable,
     pcsx2-l10n-unstable,
     pcsx2-plugins-unstable
-Description: Playstation 2 emulator.
+Description: Playstation 2 emulator
  PCSX2 is a PlayStation 2 emulator for Windows and Linux.
  .
  WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support
@@ -59,7 +59,7 @@ Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version})
 Conflicts: pcsx2-dbg,
     pcsx2-plugins-unstable-dbg
 Replaces: pcsx2-plugins-unstable-dbg
-Description: Debug symbols for pcsx2.
+Description: Debug symbols for pcsx2
  PCSX2 is a PlayStation 2 emulator for Windows and Linux.
  .
  WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support
diff --git a/debian-unstable-upstream/pcsx2-unstable.docs b/debian-unstable-upstream/docs
similarity index 100%
rename from debian-unstable-upstream/pcsx2-unstable.docs
rename to debian-unstable-upstream/docs
diff --git a/debian-unstable-upstream/pcsx2-unstable.install b/debian-unstable-upstream/install
similarity index 85%
rename from debian-unstable-upstream/pcsx2-unstable.install
rename to debian-unstable-upstream/install
index e0f12684bc..ed84a58ed0 100644
--- a/debian-unstable-upstream/pcsx2-unstable.install
+++ b/debian-unstable-upstream/install
@@ -1,4 +1,4 @@
-usr/bin/pcsx2
+usr/bin/pcsx2 /usr/games/
 usr/lib/games/pcsx2
 usr/share/applications/pcsx2.desktop
 usr/share/pixmaps/pcsx2.xpm
diff --git a/debian-unstable-upstream/pcsx2-unstable.lintian-overrides b/debian-unstable-upstream/lintian-overrides
similarity index 84%
rename from debian-unstable-upstream/pcsx2-unstable.lintian-overrides
rename to debian-unstable-upstream/lintian-overrides
index 5be0f61893..3fed012674 100644
--- a/debian-unstable-upstream/pcsx2-unstable.lintian-overrides
+++ b/debian-unstable-upstream/lintian-overrides
@@ -3,4 +3,4 @@
 #    - Upstream code uses the ebx register so it's not compliant with PIC.
 #    - Impacts the performance too much.
 #    - Only plugins. No package will link to them.
-pcsx2-plugins-unstable: shlib-with-non-pic-code
+: shlib-with-non-pic-code
diff --git a/debian-unstable-upstream/pcsx2-unstable.manpages b/debian-unstable-upstream/manpages
similarity index 100%
rename from debian-unstable-upstream/pcsx2-unstable.manpages
rename to debian-unstable-upstream/manpages
diff --git a/debian-unstable-upstream/pcsx2-unstable.menu b/debian-unstable-upstream/menu
similarity index 82%
rename from debian-unstable-upstream/pcsx2-unstable.menu
rename to debian-unstable-upstream/menu
index 40ce1a1400..bbaf11071a 100644
--- a/debian-unstable-upstream/pcsx2-unstable.menu
+++ b/debian-unstable-upstream/menu
@@ -3,4 +3,4 @@
     section="Applications/Emulators" \
     title="pcsx2" \
     longtitle="A playstation 2 emulators" \
-    command="/usr/bin/pcsx2"
+    command="/usr/games/pcsx2"