diff -Nru a/debian/changelog b/debian/changelog
--- a/debian/changelog	2014-10-21 15:17:27.000000000 -0700
+++ b/debian/changelog	2014-10-30 15:48:00.000000000 -0700
@@ -1,3 +1,15 @@
+nvidia-graphics-drivers (340.46-4) unstable; urgency=medium
+
+  * Fix installation of nvidia-smi.  (Closes: #766343)
+  * Add more dependencies on nvidia-alternative. 
+  * d/rules: Add #!armhf# and #!legacy# substitutions.
+  * nvidia-driver: Stop shipping nvidia-persistenced, this is being moved to a
+    separate source package.
+  * Split nvidia-driver-bin from the metapackage nvidia-driver.
+  * nvidia-driver-bin: Support switching via nvidia-alternative.
+
+ -- Andreas Beckmann <anbe@debian.org>  Thu, 30 Oct 2014 23:43:37 +0100
+
 nvidia-graphics-drivers (340.46-3) unstable; urgency=medium
 
   * Updated French (fr) debconf translations by Christian Perrier.
diff -Nru a/debian/control b/debian/control
--- a/debian/control	2014-10-21 15:17:27.000000000 -0700
+++ b/debian/control	2014-10-30 15:48:00.000000000 -0700
@@ -29,6 +29,7 @@
 Depends:
  libgl1-${nvidia}-glx (= ${binary:Version}),
  libegl1-${nvidia} (= ${binary:Version}),
+ ${nvidia}-driver-bin (= ${binary:Version}),
  xserver-xorg-video-${nvidia} (= ${binary:Version}),
  ${nvidia}-vdpau-driver (= ${binary:Version}),
  ${nvidia-alternative} (= ${binary:Version}),
@@ -61,6 +62,26 @@
  See /usr/share/doc/${nvidia}-driver/README.txt.gz
  for a complete list of supported GPUs and PCI IDs.
 
+#Package: ${nvidia}-driver-bin
+Package: nvidia-driver-bin
+Section: non-free/x11
+Architecture: i386 amd64 armhf
+Depends:
+ ${nvidia-alternative},
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends:
+ ${nvidia}-driver,
+Breaks:
+ ${nvidia}-driver (<< 340.46-4~),
+Replaces:
+ ${nvidia}-driver (<< 340.46-4~),
+Description: NVIDIA driver support binaries${nvidia:LegacyDesc}
+ The NVIDIA binary driver provides optimized hardware acceleration of
+ OpenGL applications via a direct-rendering X Server.
+ AGP, PCIe, SLI, TV-out and flat panel displays are also supported.
+ .
+ This package contains supporting binaries for the driver.
+
 #Package: nvidia-glx${nvidia:Legacy}
 Package: nvidia-glx
 Section: non-free/oldlibs
@@ -163,6 +184,7 @@
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ ${nvidia-alternative},
  lib${nvidia}-eglcore (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Description: NVIDIA binary EGL libraries${nvidia:LegacyDesc}
@@ -181,6 +203,7 @@
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ ${nvidia-alternative},
  lib${nvidia}-eglcore (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Description: NVIDIA binary OpenGL|ES 1.x libraries${nvidia:LegacyDesc}
@@ -202,6 +225,7 @@
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ ${nvidia-alternative},
  lib${nvidia}-eglcore (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Description: NVIDIA binary OpenGL|ES 2.x libraries${nvidia:LegacyDesc}
@@ -242,7 +266,7 @@
 Architecture: i386 amd64 armhf
 Multi-Arch: foreign
 Depends:
- glx-alternative-nvidia (>= 0.4),
+ glx-alternative-nvidia (>= 0.5),
  nvidia-modprobe,
  ${misc:Depends}
 Conflicts:
@@ -252,6 +276,7 @@
 Breaks:
  nvidia-settings (<< 319.49),
  nvidia-settings-legacy-173xx (<< 173.14.37),
+ nvidia-driver (<< 340.46-4~),
  nvidia-vdpau-driver (<< 340.46-2~),
  libcuda1 (<< 340.46-2~),
  nvidia-opencl-icd (<< 340.46-2~),
@@ -354,7 +379,7 @@
  ${misc:Pre-Depends}
 Depends:
  libvdpau1,
- ${nvidia-alternative} (= ${binary:Version}),
+ ${nvidia-alternative},
  ${shlibs:Depends}, ${misc:Depends}
 Recommends:
  ${nvidia:kmod:binary},
@@ -430,6 +455,7 @@
  ${misc:Pre-Depends}
 Depends:
  nvidia-support,
+ ${nvidia-alternative},
  ${shlibs:Depends}, ${misc:Depends}
 Recommends:
  ${nvidia:kmod:binary},
@@ -572,6 +598,7 @@
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ ${nvidia-alternative},
  ${shlibs:Depends}, ${misc:Depends}
 Breaks:
  ${nvidia}-smi (<< ${nvidia:Version}),
@@ -604,9 +631,9 @@
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
- ${nvidia-alternative} (= ${binary:Version}),
  nvidia-opencl-common,
  ocl-icd-libopencl1 | nvidia-libopencl1 | libopencl1,
+ ${nvidia-alternative},
  ${libcuda1} (= ${binary:Version}),
  lib${nvidia}-compiler (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
diff -Nru a/debian/nvidia-alternative.postinst.in b/debian/nvidia-alternative.postinst.in
--- a/debian/nvidia-alternative.postinst.in	2014-10-20 01:33:33.000000000 -0700
+++ b/debian/nvidia-alternative.postinst.in	2014-10-30 15:48:00.000000000 -0700
@@ -61,6 +61,8 @@
 		$(add_slave /usr/bin/nvidia-smi nvidia-smi /usr/lib/#PRIVATE#/nvidia-smi)
 		$(add_slave /usr/share/man/man1/nvidia-smi.1.gz nvidia-smi.1.gz /usr/lib/#PRIVATE#/nvidia-smi.1.gz)
 		$(add_slave /usr/lib/nvidia/nvidia-bug-report.sh nvidia-bug-report.sh /usr/lib/#PRIVATE#/nvidia-bug-report.sh)
+		$(add_slave /usr/bin/nvidia-debugdump nvidia-debugdump /usr/lib/#PRIVATE#/nvidia-debugdump)
+		$(add_slave /usr/share/nvidia/monitoring.conf monitoring.conf /usr/lib/#PRIVATE#/monitoring.conf)
 		$(add_slave /usr/bin/nvidia-settings nvidia-settings /usr/lib/#PRIVATE#/nvidia-settings)
 		$(add_slave /usr/bin/nv-control-dpy nv-control-dpy /usr/lib/#PRIVATE#/nv-control-dpy)
 		$(add_slave /usr/share/applications/nvidia-settings.desktop nvidia-settings.desktop /usr/lib/#PRIVATE#/nvidia-settings.desktop)
diff -Nru a/debian/nvidia-driver-bin.install.in b/debian/nvidia-driver-bin.install.in
--- a/debian/nvidia-driver-bin.install.in	1969-12-31 16:00:00.000000000 -0800
+++ b/debian/nvidia-driver-bin.install.in	2014-10-30 15:48:00.000000000 -0700
@@ -0,0 +1,6 @@
+nvidia-bug-report.sh		usr/lib/#PRIVATE#/
+nvidia-debugdump		usr/lib/#PRIVATE#/
+nvidia-application-profiles-#VERSION#-rc	usr/share/nvidia/
+nvidia-application-profiles-#VERSION#-key-documentation	usr/share/nvidia/
+#!armhf#monitoring.conf		usr/lib/#PRIVATE#/
+#!armhf##!legacy#pci.ids	usr/share/nvidia/
diff -Nru a/debian/nvidia-driver-bin.lintian-overrides.in b/debian/nvidia-driver-bin.lintian-overrides.in
--- a/debian/nvidia-driver-bin.lintian-overrides.in	1969-12-31 16:00:00.000000000 -0800
+++ b/debian/nvidia-driver-bin.lintian-overrides.in	2014-10-30 15:48:00.000000000 -0700
@@ -0,0 +1,5 @@
+# The NVIDIA license does not allow any form of modification.
+[!amd64]: binary-file-built-without-LFS-support
+embedded-library usr/lib/#PRIVATE#/nvidia-debugdump: zlib
+hardening-no-relro usr/lib/#PRIVATE#/nvidia-debugdump
+hardening-no-fortify-functions
diff -Nru a/debian/nvidia-driver.examples.in b/debian/nvidia-driver.examples.in
--- a/debian/nvidia-driver.examples.in	2013-11-02 16:51:23.000000000 -0700
+++ b/debian/nvidia-driver.examples.in	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-debian/tmp/nvidia-persistenced-init
diff -Nru a/debian/nvidia-driver.install.armhf.in b/debian/nvidia-driver.install.armhf.in
--- a/debian/nvidia-driver.install.armhf.in	2014-09-09 06:09:01.000000000 -0700
+++ b/debian/nvidia-driver.install.armhf.in	1969-12-31 16:00:00.000000000 -0800
@@ -1,5 +0,0 @@
-nvidia-bug-report.sh	usr/lib/#PRIVATE#/
-nvidia-debugdump	usr/bin/
-nvidia-persistenced	usr/bin/
-nvidia-application-profiles-#VERSION#-rc	usr/share/nvidia/
-nvidia-application-profiles-#VERSION#-key-documentation	usr/share/nvidia/
diff -Nru a/debian/nvidia-driver.install.in b/debian/nvidia-driver.install.in
--- a/debian/nvidia-driver.install.in	2014-09-09 05:59:06.000000000 -0700
+++ b/debian/nvidia-driver.install.in	1969-12-31 16:00:00.000000000 -0800
@@ -1,7 +0,0 @@
-nvidia-bug-report.sh	usr/lib/#PRIVATE#/
-nvidia-debugdump	usr/bin/
-nvidia-persistenced	usr/bin/
-nvidia-application-profiles-#VERSION#-rc	usr/share/nvidia/
-nvidia-application-profiles-#VERSION#-key-documentation	usr/share/nvidia/
-monitoring.conf		usr/share/nvidia/
-pci.ids			usr/share/nvidia/
diff -Nru a/debian/nvidia-driver.lintian-overrides b/debian/nvidia-driver.lintian-overrides
--- a/debian/nvidia-driver.lintian-overrides	2013-11-02 16:51:23.000000000 -0700
+++ b/debian/nvidia-driver.lintian-overrides	1969-12-31 16:00:00.000000000 -0800
@@ -1,6 +0,0 @@
-# The NVIDIA license does not allow any form of modification.
-[!amd64]: binary-file-built-without-LFS-support
-embedded-library usr/bin/nvidia-debugdump: zlib
-hardening-no-relro usr/bin/nvidia-debugdump
-hardening-no-relro usr/bin/nvidia-persistenced
-hardening-no-fortify-functions
diff -Nru a/debian/nvidia-driver.manpages b/debian/nvidia-driver.manpages
--- a/debian/nvidia-driver.manpages	2013-10-21 02:04:06.000000000 -0700
+++ b/debian/nvidia-driver.manpages	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-debian/tmp/nvidia-persistenced.1
diff -Nru a/debian/nvidia-smi.install b/debian/nvidia-smi.install
--- a/debian/nvidia-smi.install	2014-10-19 05:36:30.000000000 -0700
+++ b/debian/nvidia-smi.install	1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-nvidia-smi	usr/lib/#PRIVATE#
-nvidia-smi.1.gz	usr/lib/#PRIVATE#
diff -Nru a/debian/nvidia-smi.install.in b/debian/nvidia-smi.install.in
--- a/debian/nvidia-smi.install.in	1969-12-31 16:00:00.000000000 -0800
+++ b/debian/nvidia-smi.install.in	2014-10-30 15:48:00.000000000 -0700
@@ -0,0 +1,2 @@
+nvidia-smi	usr/lib/#PRIVATE#
+nvidia-smi.1.gz	usr/lib/#PRIVATE#
diff -Nru a/debian/rules b/debian/rules
--- a/debian/rules	2014-10-21 15:17:27.000000000 -0700
+++ b/debian/rules	2014-10-30 15:48:00.000000000 -0700
@@ -97,10 +97,6 @@
 	test -d $@/kernel || \
 		mv $@/usr/src/nv $@/kernel
 	-gunzip $@/*.1.gz
-	test ! -f $@/nvidia-persistenced-init.tar.bz2 || \
-		tar xfvj $@/nvidia-persistenced-init.tar.bz2 -C $@
-	test ! -d $@/nvidia-persistenced-init || \
-		chmod -R a-sx,u=rwX,go=rX $@/nvidia-persistenced-init
 
 # Unpack all architectures, we may need files from all of them.
 unpack-stamp: $(patsubst %,NVIDIA-Linux-%,$(ARCH_LIST))
@@ -309,6 +305,8 @@
 	-e 's{#WATCH_PATTERN#}{$(subst \,\\,$(watch_pattern))}g;' \
 	-e 's{#LIBDIR#}{$(libdir)}g;' \
 	-e 's{#PRIVATE#}{$(nvidia_private)}g;' \
+	-e 's{#!armhf#}{$(if $(filter armhf,$(DEB_HOST_ARCH)),#)}g;' \
+	-e 's{#!legacy#}{$(if $(legacy),#)}g;' \
 	< $< > $@
 
 debian/module/debian/changelog: debian/changelog