diff --git a/adplug-2.1-include.patch b/adplug-2.1-include.patch
new file mode 100644
index 0000000..e4dc5ca
--- /dev/null
+++ b/adplug-2.1-include.patch
@@ -0,0 +1,88 @@
+diff -Naur adplug-1.5.1.orig/adplugdb/adplugdb.cpp adplug-1.5.1/adplugdb/adplugdb.cpp
+--- adplug-1.5.1.orig/adplugdb/adplugdb.cpp	2004-08-08 19:20:07.000000000 +0000
++++ adplug-1.5.1/adplugdb/adplugdb.cpp	2005-10-29 15:01:35.233532720 +0000
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <string.h>
+-#include <binfile.h>
++#include <libbinio/binfile.h>
+ #include <string>
+ #include <iostream>
+ 
+diff -Naur adplug-1.5.1.orig/src/adplug.cpp adplug-1.5.1/src/adplug.cpp
+--- adplug-1.5.1.orig/src/adplug.cpp	2005-05-12 16:48:10.000000000 +0000
++++ adplug-1.5.1/src/adplug.cpp	2005-10-29 15:01:45.570961192 +0000
+@@ -20,7 +20,7 @@
+  */
+ 
+ #include <string>
+-#include <binfile.h>
++#include <libbinio/binfile.h>
+ 
+ #include "adplug.h"
+ #include "debug.h"
+diff -Naur adplug-1.5.1.orig/src/database.cpp adplug-1.5.1/src/database.cpp
+--- adplug-1.5.1.orig/src/database.cpp	2003-03-01 18:51:59.000000000 +0000
++++ adplug-1.5.1/src/database.cpp	2005-10-29 15:02:52.226827960 +0000
+@@ -21,8 +21,8 @@
+  * Copyright (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
+  */
+ 
+-#include <binio.h>
+-#include <binfile.h>
++#include <libbinio/binio.h>
++#include <libbinio/binfile.h>
+ #include <string.h>
+ 
+ #include "database.h"
+diff -Naur adplug-1.5.1.orig/src/database.h adplug-1.5.1/src/database.h
+--- adplug-1.5.1.orig/src/database.h	2003-03-01 18:51:59.000000000 +0000
++++ adplug-1.5.1/src/database.h	2005-10-29 15:02:36.282251904 +0000
+@@ -26,7 +26,7 @@
+ 
+ #include <iostream>
+ #include <string>
+-#include <binio.h>
++#include <libbinio/binio.h>
+ 
+ class CAdPlugDatabase
+ {
+diff -Naur adplug-1.5.1.orig/src/dmo.cpp adplug-1.5.1/src/dmo.cpp
+--- adplug-1.5.1.orig/src/dmo.cpp	2004-09-02 19:48:12.000000000 +0000
++++ adplug-1.5.1/src/dmo.cpp	2005-10-29 15:03:10.603034352 +0000
+@@ -26,7 +26,7 @@
+ */
+ 
+ #include <string.h>
+-#include <binstr.h>
++#include <libbinio/binstr.h>
+ 
+ #include "dmo.h"
+ #include "debug.h"
+diff -Naur adplug-1.5.1.orig/src/fprovide.cpp adplug-1.5.1/src/fprovide.cpp
+--- adplug-1.5.1.orig/src/fprovide.cpp	2003-02-17 16:42:50.000000000 +0000
++++ adplug-1.5.1/src/fprovide.cpp	2005-10-29 15:02:43.765114336 +0000
+@@ -20,8 +20,8 @@
+  */
+ 
+ #include <string.h>
+-#include <binio.h>
+-#include <binfile.h>
++#include <libbinio/binio.h>
++#include <libbinio/binfile.h>
+ 
+ #include "fprovide.h"
+ 
+diff -Naur adplug-1.5.1.orig/src/fprovide.h adplug-1.5.1/src/fprovide.h
+--- adplug-1.5.1.orig/src/fprovide.h	2003-01-28 13:34:35.000000000 +0000
++++ adplug-1.5.1/src/fprovide.h	2005-10-29 15:02:27.742550136 +0000
+@@ -23,7 +23,7 @@
+ #define H_ADPLUG_FILEPROVIDER
+ 
+ #include <string>
+-#include <binio.h>
++#include <libbinio/binio.h>
+ 
+ class CFileProvider
+ {
diff --git a/adplug.spec b/adplug.spec
index 3eef44e..678faaa 100644
--- a/adplug.spec
+++ b/adplug.spec
@@ -4,13 +4,16 @@
 %define adplugdbver 2006-07-07
 Name:		adplug
 Version:	2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A software library for AdLib (OPL2) emulation
 URL:		http://adplug.sourceforge.net/
 Group:		Applications/Multimedia
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:	http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz
 Patch0:		adplug-1.5.1-texinfo.patch
+# Lifted from the debian patchset
+# http://ftp.de.debian.org/debian/pool/main/a/adplug/adplug_2.0.1-6.diff.gz
+Patch1:		adplug-2.1-include.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:	LGPLv2+
 BuildRequires:	libbinio-devel >= 1.4
@@ -45,6 +48,7 @@ This package contains development files for the AdPlug AdLib
 %setup -q
 # This removes the version.texi dependency
 %patch0 -p1
+%patch1 -p1
 tar xvfz %{SOURCE1}
 # Include these by different name
 mv %{adplugdbver}/README README.adplugdb
@@ -96,6 +100,9 @@ fi
 %{_infodir}/*.gz
 
 %changelog
+* Mon Feb 11 2008 Linus Walleij <triad@df.lth.se> 2.1-5
+- Patch include directives with a patch derived from Debian.
+
 * Mon Feb 11 2008 Linus Walleij <triad@df.lth.se> 2.1-4
 - Rebuild for GCC 4.3.