diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..dc1697c
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,31 @@
+stages:
+  - package
+  - publish
+ 
+package:jessie: &package
+  image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb
+  stage: package
+  variables:
+    DISTRO: jessie
+  script:
+    - package
+  artifacts:
+    paths:
+      - pkg/
+
+package:stretch:
+  <<: *package
+  variables:
+    DISTRO: stretch
+
+package:wheezy:
+  <<: *package
+  variables:
+    DISTRO: wheezy
+
+publish:
+  image: $CI_REGISTRY/docker-images/layers:jessie-publish
+  stage: publish
+  script:
+    - publish
+
diff --git a/debian/changelog b/debian/changelog
index 68d4b02..49986d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-linux-netlink (0.18-2) stable; urgency=medium
+
+  * This package is now architecture independent.
+  * The source format has been removed in favour of using dh --with quilt.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 28 Feb 2017 16:43:43 +0000
+
 ruby-linux-netlink (0.18-1+jessie1) stable; urgency=medium
 
   * Fixed new massive IP test thing to work with ruby1.8 and also non-root users
diff --git a/debian/control b/debian/control
index 7f03e6f..af3c8db 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
 Section: ruby
 Priority: optional
-Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi
+Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi, quilt
 Standards-Version: 3.8.0
 XS-Ruby-Versions: all 
 
 Package: ruby-linux-netlink
-Architecture: any
+Architecture: all
 Depends: ruby | ruby-interpreter, ruby-ffi, ${misc:Depends}
 Provides: liblinux-netlink-ruby1.8, liblinux-netlink-ruby1.9.1
 XB-Ruby-Versions: ${ruby:Versions}
diff --git a/debian/rules b/debian/rules
index 5a433f2..89b42f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@
 # export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
-	dh $@ --buildsystem=ruby --with ruby
+	dh $@ --buildsystem=ruby --with ruby --with quilt
 
 override_dh_auto_build-arch:
 	rake lib/linux/c_struct_sizeof_size_t.rb
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)