diff --git a/debian/changelog b/debian/changelog
index 201f836..8a87d81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ nut (2.6.1-2) UNRELEASED; urgency=low
     (Closes: #529664)
   * Re-add and refresh debian/patches/0001-fix_spelling_and_typo.patch:
     Some typos and spelling errors remain.
+  * Split nut package into nut-client and nut-server, keep nut package as
+    metapackage
 
  -- Laurent Bigonville <bigon@debian.org>  Mon, 27 Jun 2011 17:26:59 +0200
 
diff --git a/debian/control b/debian/control
index b863db2..614634b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,13 +20,25 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/nut.git;a=summary
 Vcs-Git: git://git.debian.org/git/collab-maint/nut.git
 
 Package: nut
+Architecture: all
+Depends: ${misc:Depends}, nut-server, nut-client
+Description: network UPS tools - metapackage
+ Network UPS Tools (NUT) is a client/server monitoring system that
+ allows computers to share uninterruptible power supply (UPS) and
+ power distribution unit (PDU) hardware. Clients access the hardware
+ through the server, and are notified whenever the power status
+ changes.
+ .
+ This package is a metapackage that install both nut-server and nut-client
+
+Package: nut-server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.0-6), ${udev}
-Recommends: bash-completion
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.0-6), ${udev}, nut-client (= ${binary:Version})
 Suggests: nut-cgi, nut-snmp, nut-dev, nut-xml
 Provides: ups-monitor, nut-doc, nut-usb
 Conflicts: ups-monitor, nut-doc, nut-hal-drivers, nut-usb (<< 2.1.0-3), nut-dev (<< 2.2.2)
-Replaces: nut-doc
+Replaces: nut-doc, nut (<< 2.6.1)
+Breaks: nut (<< 2.6.1)
 Description: network UPS tools - core system
  Network UPS Tools (NUT) is a client/server monitoring system that
  allows computers to share uninterruptible power supply (UPS) and
@@ -38,6 +50,22 @@ Description: network UPS tools - core system
  drivers. In most cases it is sufficient for a basic UPS monitoring
  system.
 
+Package: nut-client
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: bash-completion
+Replaces: nut (<< 2.6.1)
+Breaks: nut (<< 2.6.1)
+Description: network UPS tools - clients
+ Network UPS Tools (NUT) is a client/server monitoring system that
+ allows computers to share uninterruptible power supply (UPS) and
+ power distribution unit (PDU) hardware. Clients access the hardware
+ through the server, and are notified whenever the power status
+ changes.
+ .
+ This package provides NUT's clients that allows the user to control
+ and monitor the UPS.
+
 Package: nut-cgi
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
diff --git a/debian/nut-client.install b/debian/nut-client.install
new file mode 100644
index 0000000..d15acda
--- /dev/null
+++ b/debian/nut-client.install
@@ -0,0 +1,10 @@
+debian/tmp/bin/upslog
+debian/tmp/bin/upsc
+debian/tmp/bin/upsrw
+debian/tmp/bin/upscmd
+debian/tmp/sbin/upsmon
+debian/tmp/sbin/upssched
+debian/tmp/etc/bash_completion.d/nut
+debian/tmp/etc/nut/nut.conf
+debian/tmp/etc/nut/upsmon.conf
+debian/tmp/etc/nut/upssched.conf
diff --git a/debian/nut-client.manpages b/debian/nut-client.manpages
new file mode 100644
index 0000000..115e821
--- /dev/null
+++ b/debian/nut-client.manpages
@@ -0,0 +1,9 @@
+debian/tmp/usr/share/man/man8/upsc.8
+debian/tmp/usr/share/man/man8/upscmd.8
+debian/tmp/usr/share/man/man8/upsmon.8
+debian/tmp/usr/share/man/man8/upsrw.8
+debian/tmp/usr/share/man/man8/upssched.8
+debian/tmp/usr/share/man/man5/nut.conf.5
+debian/tmp/usr/share/man/man5/upsmon.conf.5
+debian/tmp/usr/share/man/man5/upssched.conf.5
+debian/tmp/usr/share/man/man8/upslog.8
diff --git a/debian/nut.README.Debian b/debian/nut-server.README.Debian
similarity index 100%
rename from debian/nut.README.Debian
rename to debian/nut-server.README.Debian
diff --git a/debian/nut-server.dirs b/debian/nut-server.dirs
new file mode 100644
index 0000000..a805311
--- /dev/null
+++ b/debian/nut-server.dirs
@@ -0,0 +1 @@
+/var/lib/nut
diff --git a/debian/nut.init b/debian/nut-server.init
similarity index 100%
rename from debian/nut.init
rename to debian/nut-server.init
diff --git a/debian/nut.install b/debian/nut-server.install
similarity index 84%
rename from debian/nut.install
rename to debian/nut-server.install
index b535cd0..034e307 100644
--- a/debian/nut.install
+++ b/debian/nut-server.install
@@ -1,18 +1,10 @@
-debian/tmp/bin/upslog
-debian/tmp/bin/upsc
-debian/tmp/bin/upsrw
-debian/tmp/bin/upscmd
-debian/tmp/sbin/
+debian/tmp/sbin/upsd
 debian/tmp/usr/share/nut/cmdvartab
 debian/tmp/usr/share/nut/driver.list
 debian/tmp/*/udev/
-debian/tmp/etc/nut/nut.conf
 debian/tmp/etc/nut/ups.conf
 debian/tmp/etc/nut/upsd.conf
 debian/tmp/etc/nut/upsd.users
-debian/tmp/etc/nut/upsmon.conf
-debian/tmp/etc/nut/upssched.conf
-debian/tmp/etc/bash_completion.d/nut
 debian/tmp/lib/nut/genericups
 debian/tmp/lib/nut/mge-shut
 debian/tmp/lib/nut/rhino
diff --git a/debian/nut.links b/debian/nut-server.links
similarity index 100%
rename from debian/nut.links
rename to debian/nut-server.links
diff --git a/debian/nut-server.lintian-overrides b/debian/nut-server.lintian-overrides
new file mode 100644
index 0000000..9618794
--- /dev/null
+++ b/debian/nut-server.lintian-overrides
@@ -0,0 +1,2 @@
+nut-server: script-in-etc-init.d-not-registered-via-update-rc.d
+nut-server: init.d-script-does-not-provide-itself etc/init.d/ups-monitor
diff --git a/debian/nut.manpages b/debian/nut-server.manpages
similarity index 82%
rename from debian/nut.manpages
rename to debian/nut-server.manpages
index ff02b6e..b23eea8 100644
--- a/debian/nut.manpages
+++ b/debian/nut-server.manpages
@@ -1,9 +1,6 @@
-debian/tmp/usr/share/man/man5/nut.conf.5
 debian/tmp/usr/share/man/man5/ups.conf.5
 debian/tmp/usr/share/man/man5/upsd.conf.5
 debian/tmp/usr/share/man/man5/upsd.users.5
-debian/tmp/usr/share/man/man5/upsmon.conf.5
-debian/tmp/usr/share/man/man5/upssched.conf.5
 debian/tmp/usr/share/man/man8/apcsmart.8
 debian/tmp/usr/share/man/man8/bcmxcp.8
 debian/tmp/usr/share/man/man8/bcmxcp_usb.8
@@ -37,14 +34,8 @@ debian/tmp/usr/share/man/man8/solis.8
 debian/tmp/usr/share/man/man8/tripplite.8
 debian/tmp/usr/share/man/man8/tripplitesu.8
 debian/tmp/usr/share/man/man8/tripplite_usb.8
-debian/tmp/usr/share/man/man8/upsc.8
-debian/tmp/usr/share/man/man8/upscmd.8
 debian/tmp/usr/share/man/man8/upscode2.8
 debian/tmp/usr/share/man/man8/upsd.8
 debian/tmp/usr/share/man/man8/upsdrvctl.8
-debian/tmp/usr/share/man/man8/upslog.8
-debian/tmp/usr/share/man/man8/upsmon.8
-debian/tmp/usr/share/man/man8/upsrw.8
-debian/tmp/usr/share/man/man8/upssched.8
 debian/tmp/usr/share/man/man8/usbhid-ups.8
 debian/tmp/usr/share/man/man8/victronups.8
diff --git a/debian/nut.postinst b/debian/nut-server.postinst
similarity index 100%
rename from debian/nut.postinst
rename to debian/nut-server.postinst
diff --git a/debian/nut.postrm b/debian/nut-server.postrm
similarity index 100%
rename from debian/nut.postrm
rename to debian/nut-server.postrm
diff --git a/debian/nut.preinst b/debian/nut-server.preinst
similarity index 100%
rename from debian/nut.preinst
rename to debian/nut-server.preinst
diff --git a/debian/nut.prerm b/debian/nut-server.prerm
similarity index 100%
rename from debian/nut.prerm
rename to debian/nut-server.prerm
diff --git a/debian/nut.dirs b/debian/nut.dirs
deleted file mode 100644
index 0082856..0000000
--- a/debian/nut.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-/etc/nut
-/bin
-/sbin
-/var/lib/nut
diff --git a/debian/nut.lintian-overrides b/debian/nut.lintian-overrides
deleted file mode 100644
index b30037b..0000000
--- a/debian/nut.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-nut: script-in-etc-init.d-not-registered-via-update-rc.d
-nut: init.d-script-does-not-provide-itself etc/init.d/ups-monitor
diff --git a/debian/rules b/debian/rules
index 3820f30..4dd3f67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ common-install-arch::
 		mv $${f} $(CURDIR)/debian/tmp/etc/nut/$${nf};  \
 	done
 
-DEB_DH_INSTALLINIT_ARGS_nut := -- start 50 2 3 4 5 . stop 50 0 1 6 .
+DEB_DH_INSTALLINIT_ARGS_nut-server := --init-script=nut -- start 50 2 3 4 5 . stop 50 0 1 6 .
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 # for Debian