diff --git a/packaging/debian/debian/README.Debian b/packaging/debian/debian/README.Debian
new file mode 100644
index 00000000..c8b9e191
--- /dev/null
+++ b/packaging/debian/debian/README.Debian
@@ -0,0 +1,2 @@
+Spectrum2 for Debian
+--------------------
diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog
new file mode 100644
index 00000000..49e61678
--- /dev/null
+++ b/packaging/debian/debian/changelog
@@ -0,0 +1,15 @@
+spectrum2 (1:1683-a319e79-1) unstable; urgency=low
+
+  * Move package to git-buildpackage format
+  * remove the -git suffix from package names
+  * Change dependency from libswiften2-dev to libswiften-dev
+  * remove some old cruft (debian/source/options, lintian-overrides, ...)
+  * Add libevent-dev as build-dependency
+
+ -- Mathias Ertl <apt-repository@fsinf.at>  Thu, 28 Jun 2012 21:39:27 +0200
+
+spectrum2-git (2.0.0~beta+47-gdd8627b-1) unstable; urgency=low
+
+  * Upstream development snapshot
+
+ -- Mathias Ertl <apt-repository@fsinf.at>  Tue, 20 Sep 2011 11:06:50 +0200
diff --git a/packaging/debian/debian/compat b/packaging/debian/debian/compat
new file mode 100644
index 00000000..7f8f011e
--- /dev/null
+++ b/packaging/debian/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control
new file mode 100644
index 00000000..8b2c38f5
--- /dev/null
+++ b/packaging/debian/debian/control
@@ -0,0 +1,184 @@
+Source: spectrum2
+Section: net
+Priority: optional
+Maintainer: Mathias Ertl <apt-repository@fsinf.at>
+Build-Depends: debhelper (>= 7.0.50~), libpurple-dev, libswiften-dev (<< 2.0beta1),
+ libprotobuf-dev, libmysqlclient-dev, liblog4cxx10-dev, protobuf-compiler,
+ libpopt-dev, libdbus-glib-1-dev, libpqxx3-dev, cmake, libevent-dev, libboost-all-dev,
+ libqt4-dev, libidn11-dev, libxml2-dev, libavahi-client-dev, libavahi-common-dev,
+ libcurl4-openssl-dev
+Standards-Version: 3.9.2
+VCS-Browser: http://git.fsinf.at/apt/spectrum2
+VCS-Git: https://git.fsinf.at/apt/spectrum2.git
+Homepage: http://www.spectrum.im
+
+Package: libtransport2.0
+Architecture: any
+Section: net
+Priority: optional
+Depends: libswiften2 (<< 2.0beta1), ${shlibs:Depends}, ${misc:Depends}
+Replaces: libtransport2.0-git
+Description: XMPP transport
+ Spectrum 2 XMPP transport - development snapshots
+
+Package: libtransport-plugin2.0
+Architecture: any
+Section: net
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libtransport2.0-plugin-git
+Description: Library for creating spectrum2 backends and plugins
+ Spectrum 2 XMPP transport - development snapshots
+
+Package: libtransport-plugin-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libtransport-plugin2.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: libtransport2.0-plugin-git-dbg
+Description: Library for creating spectrum2 backends and plugins - debugging symbols
+ Spectrum 2 XMPP transport - development snapshots
+
+Package: libtransport-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libtransport2.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: libtransport-git-dbg
+Description: XMPP transport - debugging symbols
+ Spectrum 2 XMPP transport - development snapshots
+
+Package: libtransport-dev
+Architecture: any
+Section: libdevel
+Priority: optional
+Depends: libtransport2.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: libtransport-git-dev
+Description: XMPP transport - development headers
+ Spectrum 2 XMPP transport - development snapshots
+
+Package: spectrum2
+Architecture: any
+Section: net
+Priority: optional
+Depends: libtransport2.0 (>= ${source:Upstream-Version}), ${shlibs:Depends}, ${misc:Depends}, 
+Replaces: spectrum2-git
+Description: XMPP transport
+ Spectrum 2 XMPP transport - development snapshots
+
+Package: spectrum2-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: spectrum2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-git-dbg
+Description: XMPP transport
+ Spectrum2 debugging symbols
+
+Package: spectrum2-backend-twitter
+Architecture: any
+Section: net
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-libpurple-git
+Description: Spectrum2 libpurple backend
+ Spectrum2 backend using libpurple
+
+Package: spectrum2-backend-twitter-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: spectrum2-backend-libpurple (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-libpurple-git-dbg
+Description: Spectrum2 libpurple backend - debugging symbols
+ Debugging symbols for the Spectrum2 libpurple backend
+
+Package: spectrum2-backend-libpurple
+Architecture: any
+Section: net
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-libpurple-git
+Description: Spectrum2 libpurple backend
+ Spectrum2 backend using libpurple
+
+Package: spectrum2-backend-libpurple-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: spectrum2-backend-libpurple (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-libpurple-git-dbg
+Description: Spectrum2 libpurple backend - debugging symbols
+ Debugging symbols for the Spectrum2 libpurple backend
+
+Package: spectrum2-backend-frotz
+Architecture: any
+Section: net
+Priority: optional
+Depends: libtransport2.0 (>= ${source:Upstream-Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-frotz-git
+Description: Spectrum2 frotz backend
+ Spectrum2 backend using frotz
+
+Package: spectrum2-backend-swiften
+Architecture: any
+Section: net
+Priority: optional
+Depends: libtransport2.0 (>= ${source:Upstream-Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-swiften-git
+Description: Spectrum2 Swiften backend
+ Spectrum2 backend using Swiften
+
+Package: spectrum2-backend-frotz-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: spectrum2-backend-frotz (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-frotz-git-dbg
+Description: Spectrum2 frotz backend - debugging symbols
+ Debugging symbols for the Spectrum2 frotz backend
+
+Package: spectrum2-backend-swiften-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: spectrum2-backend-swiften (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-swiften-git-dbg
+Description: Spectrum2 Swiften backend - debugging symbols
+ Debugging symbols for the Spectrum2 Swiften backend
+
+Package: spectrum2-backend-skype
+Architecture: any
+Section: net
+Priority: optional
+Depends: libtransport2.0 (>= ${source:Upstream-Version}), ${shlibs:Depends}, ${misc:Depends}, dbus-x11, xvfb
+Replaces: spectrum2-backend-skype-git
+Description: Spectrum2 Skype backend
+ Spectrum2 backend for Skype
+
+Package: spectrum2-backend-skype-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: spectrum2-backend-skype (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-skype-git-dbg
+Description: Spectrum2 Skype backend - debugging symbols
+ Debugging symbols for the Spectrum2 Skype backend
+
+Package: spectrum2-backend-smstools3
+Architecture: any
+Section: net
+Priority: optional
+Depends: libtransport2.0 (>= ${source:Upstream-Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-smstools3-git
+Description: Spectrum2 backend for sending SMS
+ Spectrum2 backend using smstools3
+
+Package: spectrum2-backend-smstools3-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: spectrum2-backend-frotz (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: spectrum2-backend-smstools3-git-dbg
+Description: Spectrum2 backend for sending SMS - debugging symbols
+ Debugging symbols for the Spectrum2 backend for sending SMS
diff --git a/packaging/debian/debian/copyright b/packaging/debian/debian/copyright
new file mode 100644
index 00000000..c2994b43
--- /dev/null
+++ b/packaging/debian/debian/copyright
@@ -0,0 +1,12 @@
+This package was debianized by the Mathias Ertl <apt-repository@fsinf.at>
+
+License:
+
+	Copyright (C) 2010 Kevin Smith and Remko Tronçon
+	
+	You are free to distribute this software under the terms of
+	the GNU General Public License version 3.
+	The complete text of the GNU General Public License can be 
+	found in /usr/share/common-licenses/GPL-3 file.
+
+	This software is subject to the OpenSSL license exception.
diff --git a/packaging/debian/debian/libtransport-dev.install b/packaging/debian/debian/libtransport-dev.install
new file mode 100644
index 00000000..366f082b
--- /dev/null
+++ b/packaging/debian/debian/libtransport-dev.install
@@ -0,0 +1,2 @@
+/usr/lib/libtransport.so
+/usr/include
diff --git a/packaging/debian/debian/libtransport-plugin2.0.install b/packaging/debian/debian/libtransport-plugin2.0.install
new file mode 100644
index 00000000..df3f7ccb
--- /dev/null
+++ b/packaging/debian/debian/libtransport-plugin2.0.install
@@ -0,0 +1 @@
+/usr/lib/libtransport-plugin.so.2.0
diff --git a/packaging/debian/debian/libtransport2.0.install b/packaging/debian/debian/libtransport2.0.install
new file mode 100644
index 00000000..7264b420
--- /dev/null
+++ b/packaging/debian/debian/libtransport2.0.install
@@ -0,0 +1 @@
+/usr/lib/libtransport.so.2.0
diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules
new file mode 100755
index 00000000..e603e12f
--- /dev/null
+++ b/packaging/debian/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog -ldebian/changelog \
+	| grep '^Version' \
+	| sed  -e 's/Version: *//;s/^[^:]*://;s/-[^-]*$$//')
+
+build:
+	dh_testdir
+	cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DSPECTRUM_VERSION=${DEB_UPSTREAM_VERSION} .
+	export VERBOSE=1
+	VERBOSE=1 make VERBOSE=1
+
+#override_dh_auto_configure:
+
+
+override_dh_strip:
+	dh_strip -pspectrum2 --dbg-package=spectrum2-dbg
+	dh_strip -pspectrum2-backend-libpurple --dbg-package=spectrum2-backend-libpurple-dbg
+	dh_strip -pspectrum2-backend-skype --dbg-package=spectrum2-backend-skype-dbg
+	dh_strip -pspectrum2-backend-frotz --dbg-package=spectrum2-backend-frotz-dbg
+	dh_strip -pspectrum2-backend-swiften --dbg-package=spectrum2-backend-swiften-dbg
+	dh_strip -pspectrum2-backend-twitter --dbg-package=spectrum2-backend-twitter-dbg
+	dh_strip -pspectrum2-backend-smstools3 --dbg-package=spectrum2-backend-smstools3-dbg
+	dh_strip -plibtransport2.0 --dbg-package=libtransport-dbg
+	dh_strip -plibtransport-plugin2.0 --dbg-package=libtransport-plugin-dbg
+
+%:
+	dh $@
diff --git a/packaging/debian/debian/source/format b/packaging/debian/debian/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/packaging/debian/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/packaging/debian/debian/spectrum2-backend-frotz.install b/packaging/debian/debian/spectrum2-backend-frotz.install
new file mode 100644
index 00000000..a84229c0
--- /dev/null
+++ b/packaging/debian/debian/spectrum2-backend-frotz.install
@@ -0,0 +1,2 @@
+/usr/bin/spectrum2_frotz_backend
+/usr/bin/dfrotz
diff --git a/packaging/debian/debian/spectrum2-backend-libpurple.install b/packaging/debian/debian/spectrum2-backend-libpurple.install
new file mode 100644
index 00000000..dabf6b02
--- /dev/null
+++ b/packaging/debian/debian/spectrum2-backend-libpurple.install
@@ -0,0 +1 @@
+/usr/bin/spectrum2_libpurple_backend
diff --git a/packaging/debian/debian/spectrum2-backend-skype.install b/packaging/debian/debian/spectrum2-backend-skype.install
new file mode 100644
index 00000000..cf2f2372
--- /dev/null
+++ b/packaging/debian/debian/spectrum2-backend-skype.install
@@ -0,0 +1 @@
+/usr/bin/spectrum2_skype_backend
diff --git a/packaging/debian/debian/spectrum2-backend-smstools3.install b/packaging/debian/debian/spectrum2-backend-smstools3.install
new file mode 100644
index 00000000..948195f1
--- /dev/null
+++ b/packaging/debian/debian/spectrum2-backend-smstools3.install
@@ -0,0 +1 @@
+/usr/bin/spectrum2_smstools3_backend
diff --git a/packaging/debian/debian/spectrum2-backend-swiften.install b/packaging/debian/debian/spectrum2-backend-swiften.install
new file mode 100644
index 00000000..cac3d127
--- /dev/null
+++ b/packaging/debian/debian/spectrum2-backend-swiften.install
@@ -0,0 +1 @@
+/usr/bin/spectrum2_swiften_backend
diff --git a/packaging/debian/debian/spectrum2-backend-twitter.install b/packaging/debian/debian/spectrum2-backend-twitter.install
new file mode 100644
index 00000000..088dacf1
--- /dev/null
+++ b/packaging/debian/debian/spectrum2-backend-twitter.install
@@ -0,0 +1 @@
+/usr/bin/spectrum2_twitter_backend
diff --git a/packaging/debian/debian/spectrum2.install b/packaging/debian/debian/spectrum2.install
new file mode 100644
index 00000000..d37d976c
--- /dev/null
+++ b/packaging/debian/debian/spectrum2.install
@@ -0,0 +1,3 @@
+/etc/spectrum2
+/usr/bin/spectrum2
+/usr/bin/spectrum2_manager