diff -u brltty-3.7.2/Programs/usb_linux.c brltty-3.7.2/Programs/usb_linux.c
--- brltty-3.7.2/Programs/usb_linux.c
+++ brltty-3.7.2/Programs/usb_linux.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
-/* #include <linux/compiler.h> */
+#include <linux/compiler.h>
 #include <linux/usbdevice_fs.h>
 
 #ifndef USBDEVFS_DISCONNECT
diff -u brltty-3.7.2/debian/libbrlapi1.install brltty-3.7.2/debian/libbrlapi1.install
--- brltty-3.7.2/debian/libbrlapi1.install
+++ brltty-3.7.2/debian/libbrlapi1.install
@@ -1,3 +1,2 @@
 debian/brltty/lib/lib*.so.* lib
-debian/brltty/lib/*.so /lib
 debian/brltty/sbin/xbrlapi bin
diff -u brltty-3.7.2/debian/changelog brltty-3.7.2/debian/changelog
--- brltty-3.7.2/debian/changelog
+++ brltty-3.7.2/debian/changelog
@@ -1,24 +1,3 @@
-brltty (3.7.2-3.1ubuntu1) edgy; urgency=low
-
-  * Merge from debian unstable.
-  * Move /lib/libbrlapi.so symbolic link from libbrlapi1-dev to
-    libbrlapi1 to make sure that gnome-orca can work with braille
-    support.
-  * Commented out the include for linux/compiler.h in 
-    Programs/usb_linux.c.
-
- -- Luke Yelavich <themuso@ubuntu.com>  Wed, 16 Aug 2006 22:57:14 +1000
-
-brltty (3.7.2-3.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * changing build-depends from libbluetooth1-dev to libbluetooth2-dev |
-    libbluetooth-dev as suggested by Felipe Augusto van de Wiel and Rudy
-    Godoy. (Closes: #376863)
-    Thanks!
-
- -- Alexander Schmehl <tolimar@debian.org>  Thu, 27 Jul 2006 13:54:51 +0200
-
 brltty (3.7.2-3ubuntu1) edgy; urgency=low
 
   * Resynchronized with Debian, only Ubuntu changes are:
@@ -350 +328,0 @@
-
diff -u brltty-3.7.2/debian/control brltty-3.7.2/debian/control
--- brltty-3.7.2/debian/control
+++ brltty-3.7.2/debian/control
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Mario Lang <mlang@debian.org>
 Build-Depends: debhelper (>= 4.2), bison, doxygen, linuxdoc-tools, groff,
- flite1-dev, libncurses5-dev, libxaw7-dev, libatspi-dev, libbluetooth2-dev | libbluetooth-dev
+ flite1-dev, libncurses5-dev, libxaw7-dev, libatspi-dev, libbluetooth1-dev
 Standards-Version: 3.6.1
 
 Package: brltty
diff -u brltty-3.7.2/debian/libbrlapi1-dev.install brltty-3.7.2/debian/libbrlapi1-dev.install
--- brltty-3.7.2/debian/libbrlapi1-dev.install
+++ brltty-3.7.2/debian/libbrlapi1-dev.install
@@ -1,2 +1,3 @@
 debian/brltty/lib/*.a lib
+debian/brltty/lib/*.so /lib
 debian/brltty/usr/include/brltty usr/include