diff -Nru pigpio-1.68/debian/changelog pigpio-1.68/debian/changelog
--- pigpio-1.68/debian/changelog	2019-01-24 13:25:48.000000000 +0000
+++ pigpio-1.68/debian/changelog	2019-01-24 13:31:37.000000000 +0000
@@ -1,3 +1,10 @@
+pigpio (1.68-3+rpi1) buster-staging; urgency=medium
+
+  * Add back systemd stuff and ensure systemd unit is only installed in pigpiod package.
+  * Add server related packages and metapackage.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Jan 2019 13:31:37 +0000
+
 pigpio (1.68-3) unstable; urgency=medium
 
   * Fix short description for libpigpiod-if-dev package.
diff -Nru pigpio-1.68/debian/control pigpio-1.68/debian/control
--- pigpio-1.68/debian/control	2019-01-24 13:25:48.000000000 +0000
+++ pigpio-1.68/debian/control	2019-01-24 13:31:37.000000000 +0000
@@ -26,8 +26,7 @@
 Conflicts: pigpio (<< 1.68-1)
 Description: Client library for Raspberry Pi GPIO control (deprecated)
  Pigpio is a set of software which allows control of the General Purpose Input
- Outputs (GPIO) locally or remotely. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides the deprecated libpigpiod_if client library
 
@@ -38,23 +37,75 @@
 Conflicts: pigpio (<< 1.68-1)
 Description: Development headers for client libraries for Raspberry Pi GPIO control
  Pigpio is a set of software which allows control of the General Purpose Input
- Outputs (GPIO) locally or remotely. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides development headers for the libpigpiod_if2 and
  libpigpiod_if client libraries.
 
+Package: libpigpio1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: pigpio (<< 1.68-1)
+Description: Library for Raspberry Pi GPIO control
+ Pigpio is a set of software which allows control of the General Purpose Input
+ Outputs (GPIO) locally or remotely.
+ .
+ This package provides the pigpio library used to access the GPIO directly.
+ (used by the pigpiod server, can also be used directly if desired)
+
+Package: libpigpio-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpigpio1 (= ${binary:Version})
+Conflicts: pigpio (<< 1.68-1)
+Description: Client tools for Raspberry Pi GPIO control
+ Pigpio is a set of software which allows control of the General Purpose Input
+ Outputs (GPIO) locally or remotely.
+ .
+ This package provides the development headers for the pigpio library used to
+ access the GPIO directly. 
+
 Package: pigpio-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: pigpio (<< 1.68-1)
 Description: Client tools for Raspberry Pi GPIO control
  Pigpio is a set of software which allows control of the General Purpose Input
- Outputs (GPIO) locally or remotely. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides the pigs and pig2vcd tools.
 
+Package: pigpiod
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: pigpio (<< 1.68-1)
+Description: Client tools for Raspberry Pi GPIO control
+ Pigpio is a set of software which allows control of the General Purpose Input
+ Outputs (GPIO) locally or remotely.
+ .
+ This package provides the pigpiod daemon which offers a socket and pipe
+ interface to the underlying library.
+
+Package: pigpio
+Architecture: any
+Depends: 
+ libpigpiod-if2-1 (= ${binary:Version}),
+ libpigpiod-if1 (= ${binary:Version}),
+ libpigpiod-if-dev (= ${binary:Version}),
+ pigpio-tools (= ${binary:Version}),
+ libpigpio1 (= ${binary:Version}),
+ libpigpio-dev (= ${binary:Version}),
+ pigpio-tools (= ${binary:Version}),
+ pigpiod (= ${binary:Version}),
+ pigpio (= ${binary:Version})
+Description:  Raspberry Pi GPIO control transitional package.
+ Pigpio is a set of software which allows control of the General Purpose Input
+ Outputs (GPIO) locally or remotely.
+ .
+ This is a transitional package that installs everything that was previously
+ included in the pigpio package before the package split 
+
 Package: python-pigpio
 Section: python
 Architecture: all
@@ -62,8 +113,7 @@
 Recommends: pigpio
 Description: Python module which talks to the pigpio daemon (Python 2)
  Pigpio is a set of software which allows control of the General Purpose Input
- Outputs (GPIO) locally or remotely. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides the python 2 client library.
 
@@ -74,7 +124,6 @@
 Recommends: pigpio
 Description: Python module which talks to the pigpio daemon (Python 3)
  Pigpio is a set of software which allows control of the General Purpose Input
- Outputs (GPIO) locally or remotely. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides the python 3 client library.
diff -Nru pigpio-1.68/debian/libpigpio1.install pigpio-1.68/debian/libpigpio1.install
--- pigpio-1.68/debian/libpigpio1.install	1970-01-01 00:00:00.000000000 +0000
+++ pigpio-1.68/debian/libpigpio1.install	2019-01-24 13:31:37.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libpigpio.so.1
diff -Nru pigpio-1.68/debian/libpigpio-dev.install pigpio-1.68/debian/libpigpio-dev.install
--- pigpio-1.68/debian/libpigpio-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ pigpio-1.68/debian/libpigpio-dev.install	2019-01-24 13:31:37.000000000 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libpigpio.so
+debian/tmp/usr/include/pigpio.h
diff -Nru pigpio-1.68/debian/libpigpio-dev.manpages pigpio-1.68/debian/libpigpio-dev.manpages
--- pigpio-1.68/debian/libpigpio-dev.manpages	1970-01-01 00:00:00.000000000 +0000
+++ pigpio-1.68/debian/libpigpio-dev.manpages	2019-01-24 13:31:37.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/man/man3/pigpio.3
diff -Nru pigpio-1.68/debian/pigpiod.install pigpio-1.68/debian/pigpiod.install
--- pigpio-1.68/debian/pigpiod.install	1970-01-01 00:00:00.000000000 +0000
+++ pigpio-1.68/debian/pigpiod.install	2019-01-24 13:31:37.000000000 +0000
@@ -0,0 +1,2 @@
+debian/tmp/opt
+debian/tmp/usr/bin/pigpiod
diff -Nru pigpio-1.68/debian/pigpiod.manpages pigpio-1.68/debian/pigpiod.manpages
--- pigpio-1.68/debian/pigpiod.manpages	1970-01-01 00:00:00.000000000 +0000
+++ pigpio-1.68/debian/pigpiod.manpages	2019-01-24 13:31:37.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/man/man1/pigpiod.1
diff -Nru pigpio-1.68/debian/rules pigpio-1.68/debian/rules
--- pigpio-1.68/debian/rules	2019-01-24 13:25:48.000000000 +0000
+++ pigpio-1.68/debian/rules	2019-01-24 13:31:37.000000000 +0000
@@ -7,9 +7,14 @@
 export DEB_CFLAGS_MAINT_APPEND = -Wno-format-security
 
 %:
-	dh $@ --with python2,python3 --parallel
+	dh $@ --with python2,python3,systemd --parallel
 
 override_dh_clean:
 	rm -rf build
 	dh_clean
 
+override_dh_systemd_start:
+	dh_systemd_start -p pigpiod --name pigpiod --no-start
+
+override_dh_systemd_enable:
+	dh_systemd_enable -p pigpiod --name pigpiod --no-enable