diff --git a/debian/changelog b/debian/changelog
index 7356843..2f5a8ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ nut (2.6.5-1) UNRELEASED; urgency=low
   * debian/nut-server.install: Drop newmge-shut, renamed upstream to mge-shut
     and install the old implementation (oldmge-shut) instead
   * debian/control: Drop ancient Conflicts/Provides/Replaces
+  * Install all development files under /usr
 
- -- Laurent Bigonville <bigon@debian.org>  Mon, 13 Aug 2012 00:56:42 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 13 Aug 2012 01:11:26 +0200
 
 nut (2.6.4-2) unstable; urgency=low
 
diff --git a/debian/libupsclient1-dev.dirs b/debian/libupsclient1-dev.dirs
deleted file mode 100644
index 502167f..0000000
--- a/debian/libupsclient1-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/lib
diff --git a/debian/libupsclient1-dev.install b/debian/libupsclient1-dev.install
index 144903a..5b3120a 100644
--- a/debian/libupsclient1-dev.install
+++ b/debian/libupsclient1-dev.install
@@ -1,5 +1,4 @@
-lib/*/libupsclient.so
 usr/lib/*/libupsclient.so
-lib/*/libupsclient.a
-usr/lib/*/pkgconfig/
+usr/lib/*/libupsclient.a
+usr/lib/*/pkgconfig/libupsclient.pc
 usr/include
diff --git a/debian/patches/0003-install-dev-files-in-usr.patch b/debian/patches/0003-install-dev-files-in-usr.patch
new file mode 100644
index 0000000..73ea30b
--- /dev/null
+++ b/debian/patches/0003-install-dev-files-in-usr.patch
@@ -0,0 +1,20 @@
+Description: Adjust .pc paths to install development files to /usr
+Author: Laurent Bigonville <bigon@debian.org>
+Forwarded: not-needed
+
+--- a/lib/libnutscan.pc.in
++++ b/lib/libnutscan.pc.in
+@@ -1,4 +1,4 @@
+-prefix=@prefix@
++prefix=/usr
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+--- a/lib/libupsclient.pc.in
++++ b/lib/libupsclient.pc.in
+@@ -1,4 +1,4 @@
+-prefix=@prefix@
++prefix=/usr
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
diff --git a/debian/patches/series b/debian/patches/series
index 2024d93..0b2897f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0003-install-dev-files-in-usr.patch
 0002-nut-monitor-paths.patch
diff --git a/debian/rules b/debian/rules
index e647ddc..9104960 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,11 @@ common-install-arch::
 		mv $${f} $(CURDIR)/debian/tmp/etc/nut/$${nf};  \
 	done
 
-	# Create -dev symlink under /usr
-	ln -s /lib/$(DEB_HOST_MULTIARCH)/libupsclient.so.1.1.0 \
+	# Move -dev file to /usr
+	mv $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libupsclient.a \
+		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.a
+	rm -f $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so
+	ln -s /lib/$(DEB_HOST_MULTIARCH)/libupsclient.so.1 \
 		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so
 
 	# Install systemd files only on systems where it's supported