diff --git a/debian/changelog b/debian/changelog
index 04bf46169eafbbf3201d9f7649fbd1078dc77db3..235f0d9d819b291839b12ead0c069dc853442513 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 pkcs11-proxy (0.1) unstable; urgency=low
 
+  [ Corentin Chary ]
   * Initial release.
 
- -- Corentin Chary <cchary@commonit.com>  Tue, 16 Feb 2010 13:59:59 +0100
+  [ Leif Johansson ]
+  * Make it build without the opt prefix
+
+ -- Leif Johansson <leifj@mnt.se>  Sat, 31 Mar 2012 22:33:03 +0200
diff --git a/debian/control b/debian/control
index 84851399cb53b55d91dd1a81262a818afeac93ba..c6d188a3028cd47ac895c58c13d49b4d64f14577 100755
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: pkcs11-proxy
 Priority: extra
 Maintainer: Corentin Chary <cchary@commonit.com>
+Uploaders: Leif Johansson <leifj@mnt.se>
 Build-Depends: cdbs, debhelper (>= 6), cmake
 Standards-Version: 3.8.0
 Section: libs
diff --git a/debian/pkcs11-daemon.install b/debian/pkcs11-daemon.install
index a2857bf00a9d6ae535d3eb95d14af925bb3e77f0..972c9c1c91a16a9e5429f61ece2af805823dafb8 100644
--- a/debian/pkcs11-daemon.install
+++ b/debian/pkcs11-daemon.install
@@ -1 +1 @@
-debian/tmp/opt/commonit/usr/bin/pkcs11-daemon	/usr/bin
\ No newline at end of file
+debian/tmp/usr/bin/pkcs11-daemon	/usr/bin
diff --git a/debian/pkcs11-proxy1.install b/debian/pkcs11-proxy1.install
index 356cdd2c1a6a48b594ba75d516c0bab1ecda874e..cce099314af8c9ee4f55f41621fae0419d0aa0bc 100644
--- a/debian/pkcs11-proxy1.install
+++ b/debian/pkcs11-proxy1.install
@@ -1 +1 @@
-debian/tmp/opt/commonit/usr/lib/libpkcs11-proxy*.so*	/opt/commonit/usr/lib
+debian/tmp/usr/lib/libpkcs11-proxy*.so*	/usr/lib
diff --git a/debian/rules b/debian/rules
index d77a508302ab376252b54251bb0aee06f5b6ec7a..609f0bd604b2b81b2461bc45e691045a434ee322 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,5 @@
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-DEB_CMAKE_INSTALL_PREFIX=/opt/commonit/usr/
-DEB_DH_BUILDDEB_ARGS=--destdir=$(HOME)/pkg-pool
+#DEB_CMAKE_INSTALL_PREFIX=/opt/commonit/usr/
+#DEB_DH_BUILDDEB_ARGS=--destdir=$(HOME)/pkg-pool