diff --git a/debian/changelog b/debian/changelog
index c6ce75cab..bca5ad29e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libgit2 (0.18.0-1) UNRELEASED; urgency=low
+
+  [ Russell Sim ]
+  * Removed windows specific headers.
+
+  [ Carlos Martín Nieto ]
+  * Build-Depend on python-minimal instead of -all
+  * BUILD_TESTS isn't used in this project
+
+  [ Russell Sim ]
+  * New upstream release 0.18.0.
+
+ -- Russell Sim <russell.sim@gmail.com>  Sun, 21 Apr 2013 14:04:39 +1000
+
 libgit2 (0.17.0-1) experimental; urgency=low
 
   * New Upstream Release.
diff --git a/debian/control b/debian/control
index f415aa5b7..4dfaf1999 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: libgit2
 Section: libs
 Priority: extra
 Maintainer: Russell Sim <russell.sim@gmail.com>
-Build-Depends: debhelper (>= 9.20120417), python-minimal (>= 2.4.0), cmake, libz-dev
+Build-Depends: debhelper (>= 9.20120417), python-minimal (>= 2.4.0),
+               cmake, libz-dev, libssl-dev, ca-certificates
 Standards-Version: 3.9.3
 Homepage: http://libgit2.github.com/
 #Vcs-Git: git://git.debian.org/collab-maint/libgit2.git
diff --git a/debian/patches/series b/debian/patches/series
index 573b75649..8b1378917 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-build_static.patch
+
diff --git a/debian/rules b/debian/rules
index da63a2e72..d7435c0c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,25 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --dbg-package=libgit2-dbg
+	dh $@ --buildsystem cmake --dbg-package=libgit2-dbg --builddirectory=build-debian-release 
+	dh $@ --buildsystem cmake --builddirectory=build-debian-devel
+
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_CLAR:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
+	dh_auto_configure --builddirectory=build-debian-release -- -DBUILD_CLAR:BOOL=ON -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
+	dh_auto_configure --builddirectory=build-debian-devel -- -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_CLAR:BOOL=OFF
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V 'libgit2-0 (>= 0.16.0)'
+	dh_makeshlibs -V 'libgit2-0 (>= 0.18.0)'
+
+override_dh_auto_build :
+	dh_auto_build --builddirectory=build-debian-release
+	dh_auto_build --builddirectory=build-debian-devel
+
+override_dh_auto_install :
+	dh_auto_install --builddirectory=build-debian-release
+	dh_auto_install --builddirectory=build-debian-devel
 
 override_dh_install:
-	dh_install -Xwindows.h -Xinttypes.h -Xstdint.h
+	find /tmp/buildd/libgit2-0.18.0/debian/
+	dh_install