diff --git a/debian-unstable-upstream/README.Debian b/debian-unstable-upstream/README.Debian
index b996d0de2f..4f7149cf00 100644
--- a/debian-unstable-upstream/README.Debian
+++ b/debian-unstable-upstream/README.Debian
@@ -3,8 +3,6 @@
 
 * This version has some major modifications against the default upstream version. 
     -> documents are stored in $XDG_CONFIG_HOME instead of $HOME/pcsx2
-    -> some features were removed so it could compile against libsound 1.3.
-    Pcsx2 needs at least soundtouch 1.5.
 
 * This package is highly experimental.
 
diff --git a/debian-unstable-upstream/TODO.debian b/debian-unstable-upstream/TODO.debian
index 4df745c938..754bb1c48e 100644
--- a/debian-unstable-upstream/TODO.debian
+++ b/debian-unstable-upstream/TODO.debian
@@ -1,28 +1,13 @@
-need libsoundtouch v1.5
-
 * policy bin2cpp tool ??
     May be we could pregenerate the file in the upstream tar ball!!
 
 * copyright and doc stuff
     Lots of work to do here....
-
-    # only a stub
-    plugins/zzogl-pg/opengl/memcpy_amd.cpp: UNKNOWN
-
-    # need zerofrog confirmation of gpl v2
-    plugins/zzogl-pg/opengl/zpipe.h: *No copyright* UNKNOWN
-    plugins/zzogl-pg/opengl/shaders.sh: *No copyright* UNKNOWN
-    plugins/zzogl-pg/opengl/common.h: *No copyright* UNKNOWN
-    plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.h: *No copyright* UNKNOWN
-    plugins/zzogl-pg/opengl/ZeroGSShaders/zerogsshaders.cpp: *No copyright* UNKNOWN
-    plugins/zzogl-pg/opengl/ZeroGSShaders/zerogsshaders.h: *No copyright* UNKNOWN
-    plugins/zzogl-pg/opengl/ZeroGSShaders/zpipe.cpp: *No copyright* UNKNOWN
-    plugins/zzogl-pg/opengl/zerogsmath.h: *No copyright* UNKNOWN
-    plugins/zzogl-pg/opengl/zpipe.cpp: *No copyright* UNKNOWN
+    * need to add copyrigh info in Cmake file
 
 ## 64 bit
-nvidia-cg-toolkit: propably need a special package for 32 bits version
-ia32-libs: add libportaudio, libsoundtouch, libglew
+nvidia-cg-toolkit: replace it with GLSL
+ia32-libs: add libportaudio, libglew
 ia32-libs: add .so symlink for compilation
 ia32-libs-gtk: add libwxbase2.8 and libwxgtk2.8 (warning a architecture dependant include file (in -dev package) is also needed)
 ia32-libs-gtk: add .so symlink for compilation
diff --git a/debian-unstable-upstream/control b/debian-unstable-upstream/control
index ee5c3226db..08531ee4c6 100644
--- a/debian-unstable-upstream/control
+++ b/debian-unstable-upstream/control
@@ -119,7 +119,7 @@ Priority: optional
 # Warning amd64 need additional ia32libs
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: pcsx2-plugins-dbg
+Conflicts: pcsx2-l10n
 Description: Languages package for PCSX2
  PCSX2 is a PlayStation 2 emulator for Windows and Linux.
  .
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 7e234048ce..2e4798a418 100755
--- a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
+++ b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
@@ -80,7 +80,7 @@ echo "Downloading pcsx2 source revision ${SVN_CO_VERSION}"
 mkdir -p $ROOT_DIR;
 (cd $ROOT_DIR; 
     get_svn_file CMakeLists.txt;
-    get_svn_dir bin common cmake pcsx2 tools;
+    get_svn_dir bin common cmake locales pcsx2 tools;
     get_svn_dir debian-unstable-upstream;
 echo "Done")
 
diff --git a/debian-unstable-upstream/source/options b/debian-unstable-upstream/source/options
new file mode 100644
index 0000000000..19bafd128a
--- /dev/null
+++ b/debian-unstable-upstream/source/options
@@ -0,0 +1,2 @@
+# Don't store changes on locales files
+extend-diff-ignore = "(^|/)(pcsx2_(Devel|Iconized|Main|Tertiary)\.po)$"