diff --git a/packaging/deb/freerdp-nightly/changelog b/packaging/deb/freerdp-nightly/changelog
new file mode 100644
index 000000000..581d0d656
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/changelog
@@ -0,0 +1,5 @@
+freerdp-nightly (1.2.0) unstable; urgency=medium
+
+  * Initial version of freerdp-nightly
+
+ -- FreeRDP <team@freerdp.com>  Wed, 07 Jan 2015 10:09:32 +0100
diff --git a/packaging/deb/freerdp-nightly/compat b/packaging/deb/freerdp-nightly/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/compat
@@ -0,0 +1 @@
+9
diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control
new file mode 100644
index 000000000..aafadd531
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/control
@@ -0,0 +1,91 @@
+Source: freerdp-nightly
+Section: x11
+Priority: optional
+Maintainer: FreeRDP <team@freerdp.com>
+Build-Depends:
+ debhelper (>= 9),
+ cdbs,
+ autotools-dev,
+ cmake,
+ pkg-config,
+ xmlto,
+ libssl-dev,
+ docbook-xsl,
+ xsltproc,
+ libxkbfile-dev,
+ libx11-dev,
+ libwayland-dev,
+ libxrandr-dev,
+ libxi-dev,
+ libxrender-dev,
+ libxext-dev,
+ libxinerama-dev,
+ libxfixes-dev,
+ libxcursor-dev,
+ libxv-dev,
+ libxdamage-dev,
+ libxtst-dev,
+ libcups2-dev,
+ libpcsclite-dev,
+ libasound2-dev,
+ libpulse-dev, 
+ libavcodec-dev,
+ libavutil-dev,
+ libjpeg-dev,
+ libgsm1-dev, 
+ libusb-1.0-0-dev,
+ libudev-dev,
+ libdbus-glib-1-dev,
+ uuid-dev, 
+ libxml2-dev,
+ libgstreamer1.0-dev | libgstreamer0.10-dev,
+ libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev
+Standards-Version: 3.9.5
+Homepage: http://www.freerdp.com/
+Vcs-Browser: http://github.com/FreeRDP/FreeRDP.git
+Vcs-Git: git://github.com/FreeRDP/FreeRDP.git
+
+Package: freerdp-nightly
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: freerdp
+Description: RDP client for Windows Terminal Services (X11 client)
+ FreeRDP is a libre client/server implementation of the Remote
+ Desktop Protocol (RDP).
+ .
+ Currently, the FreeRDP client supports the following Windows Versions:
+ .
+  * Windows NT Server
+  * Windows 2000 Terminal Server
+  * Windows XP
+  * Windows 2003 Server
+  * Windows Vista
+  * Windows 2008/2008r2/2011SBS Server
+  * Windows 7
+  * Windows 2012 Server
+  * Windows 8
+ .
+ This package contains the X11 based client.
+
+Package: freerdp-nightly-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: freerdp-nightly (= ${binary:Version}), ${misc:Depends}
+Description: Free Remote Desktop Protocol library (development files)
+ FreeRDP is a libre client/server implementation of the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the FreeRDP development files.
+
+Package: freerdp-nightly-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ freerdp-nightly (= ${binary:Version}), ${misc:Depends},
+Description: RDP client for Windows Terminal Services (X11 client, debug symbols)
+ FreeRDP is a libre client/server implementation of the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the debug symbols of the xfreerdp executable.
diff --git a/packaging/deb/freerdp-nightly/copyright b/packaging/deb/freerdp-nightly/copyright
new file mode 100644
index 000000000..e69de29bb
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly-dbg.lintian-overrides b/packaging/deb/freerdp-nightly/freerdp-nightly-dbg.lintian-overrides
new file mode 100644
index 000000000..8108c1ed1
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/freerdp-nightly-dbg.lintian-overrides
@@ -0,0 +1 @@
+freerdp-nightly-dbg: no-copyright-file new-package-should-close-itp-bug dir-or-file-in-opt package-name-doesnt-match-sonames
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install b/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install
new file mode 100644
index 000000000..5c604b138
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install
@@ -0,0 +1,2 @@
+opt/freerdp-nightly/lib
+opt/freerdp-nightly/include
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly-dev.lintian-overrides b/packaging/deb/freerdp-nightly/freerdp-nightly-dev.lintian-overrides
new file mode 100644
index 000000000..0f6ac7a2b
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/freerdp-nightly-dev.lintian-overrides
@@ -0,0 +1 @@
+freerdp-nightly-dev: no-copyright-file dir-or-file-in-opt
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly.install b/packaging/deb/freerdp-nightly/freerdp-nightly.install
new file mode 100644
index 000000000..d4faef614
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/freerdp-nightly.install
@@ -0,0 +1,3 @@
+opt/freerdp-nightly/lib
+opt/freerdp-nightly/bin
+opt/freerdp-nightly/share/man/man1/xfreerdp.1*
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly.lintian-overrides b/packaging/deb/freerdp-nightly/freerdp-nightly.lintian-overrides
new file mode 100644
index 000000000..62263e047
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/freerdp-nightly.lintian-overrides
@@ -0,0 +1 @@
+freerdp-nightly: no-copyright-file new-package-should-close-itp-bug dir-or-file-in-opt package-name-doesnt-match-sonames
diff --git a/packaging/deb/freerdp-nightly/lintian-overrides b/packaging/deb/freerdp-nightly/lintian-overrides
new file mode 100644
index 000000000..d583c69f2
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/lintian-overrides
@@ -0,0 +1 @@
+freerdp-nightly source: no-debian-copyright
diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules
new file mode 100755
index 000000000..e88f076d0
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/rules
@@ -0,0 +1,53 @@
+#!/usr/bin/make -f
+
+DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifneq (,$(filter armhf,$(DEB_HOST_ARCH)))
+ARM_FLOAT_ABI = -DARM_FP_ABI=hard
+else
+ARM_FLOAT_ABI =
+endif
+NULL =
+
+DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
+                          -DCMAKE_SKIP_INSTALL_RPATH=FALSE \
+                          -DWITH_PULSE=ON \
+                          -DWITH_CHANNELS=ON \
+                          -DSTATIC_CHANNELS=ON \
+                          -DWITH_CUPS=ON \
+                          -DWITH_PCSC=ON \
+                          -DWITH_JPEG=ON \
+                          -DWITH_GSTREAMER_0_10=ON \
+                          -DWITH_GSM=ON \
+                          -DCHANNEL_URBDRC=ON \
+                          -DCHANNEL_URBDRC_CLIENT=ON \
+                          -DWITH_SERVER=ON \
+                          -DBUILD_TESTING=OFF \
+                          -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \
+                          -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \
+                          -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \
+                          $(ARM_FLOAT_ABI) \
+                          $(NULL)
+
+%:
+	dh $@ --parallel
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l /opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/
+
+override_dh_strip:
+	dh_strip --dbg-package=freerdp-nightly-dbg
+
+override_dh_install:
+	rm -f debian/tmp/opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/libwinpr-makecert-tool.a
+	rm -f debian/tmp/opt/freerdp-nightly/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/freerdp/*.a
+	rm -f debian/tmp/opt/freerdp-nightly/lib/libwinpr-makecert-tool.a
+	rm -f debian/tmp/opt/freerdp-nightly/lib/freerdp/*.a
+	dh_install --fail-missing
+
+override_dh_clean:
+	rm -f include/version.h
+	rm -f config.h
+	dh_clean
diff --git a/packaging/deb/freerdp-nightly/source/format b/packaging/deb/freerdp-nightly/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/packaging/deb/freerdp-nightly/source/format
@@ -0,0 +1 @@
+3.0 (native)