diff -Nru bumblebee-3.2.1/debian/bumblebee.conf bumblebee-3.2.1/debian/bumblebee.conf
--- bumblebee-3.2.1/debian/bumblebee.conf	2015-07-26 05:30:47.000000000 +0000
+++ bumblebee-3.2.1/debian/bumblebee.conf	2015-08-15 06:42:28.000000000 +0000
@@ -61,3 +61,7 @@
 blacklist nvidia-352
 blacklist nvidia-352-updates
 blacklist nvidia-experimental-352
+# 355
+blacklist nvidia-355
+blacklist nvidia-355-updates
+blacklist nvidia-experimental-355
diff -Nru bumblebee-3.2.1/debian/bumblebee.postinst bumblebee-3.2.1/debian/bumblebee.postinst
--- bumblebee-3.2.1/debian/bumblebee.postinst	2015-08-13 08:27:09.000000000 +0000
+++ bumblebee-3.2.1/debian/bumblebee.postinst	2015-08-15 06:24:34.000000000 +0000
@@ -51,10 +51,6 @@
             echo "Deleting old /etc/bumblebee/xorg.conf.d/busid.conf"
             rm /etc/bumblebee/xorg.conf.d/busid.conf
         fi
-        # On Ubuntu modprobe remove line is not present
-        echo "Adding modprobe remove line to /etc/modprobe.d/bumblebee.conf"
-        echo "# Workaround to make sure nvidia-uvm is removed as well" >> /usr/share/bumblebee/default-conf/bumblebee.conf
-        echo "remove nvidia rmmod nvidia-uvm nvidia" >> /usr/share/bumblebee/default-conf/bumblebee.conf
     fi
 
     # Do not treat /etc/modprobe.d/bumblebee-nvidia.conf as a conffile
diff -Nru bumblebee-3.2.1/debian/changelog bumblebee-3.2.1/debian/changelog
--- bumblebee-3.2.1/debian/changelog	2015-08-13 08:29:29.000000000 +0000
+++ bumblebee-3.2.1/debian/changelog	2015-08-15 06:47:33.000000000 +0000
@@ -1,3 +1,9 @@
+bumblebee (3.2.1-93~wilyppa1) wily; urgency=medium
+
+  * Add nvidia-355 in alternate dep and blacklist.
+
+ -- Vincent Cheng <vcheng@debian.org>  Fri, 14 Aug 2015 23:45:47 -0700
+
 bumblebee (3.2.1-92~wilyppa1) wily; urgency=medium
 
   * Fix module unloading timeout caused by modprobe-r-instead-of-rmmod.patch.
diff -Nru bumblebee-3.2.1/debian/control bumblebee-3.2.1/debian/control
--- bumblebee-3.2.1/debian/control	2015-07-26 05:30:15.000000000 +0000
+++ bumblebee-3.2.1/debian/control	2015-08-15 06:42:02.000000000 +0000
@@ -44,7 +44,8 @@
  nvidia-343 | nvidia-343-updates | nvidia-experimental-343 |
  nvidia-346 | nvidia-346-updates | nvidia-experimental-346 |
  nvidia-349 | nvidia-349-updates | nvidia-experimental-349 |
- nvidia-352 | nvidia-352-updates | nvidia-experimental-352
+ nvidia-352 | nvidia-352-updates | nvidia-experimental-352 |
+ nvidia-355 | nvidia-355-updates | nvidia-experimental-355
 Description: NVIDIA Optimus support using the proprietary NVIDIA driver
  This metapackage ensures that the proprietary NVIDIA driver is installed in a
  way such that 3D acceleration does not break. It does so by configuring the
diff -Nru bumblebee-3.2.1/debian/rules bumblebee-3.2.1/debian/rules
--- bumblebee-3.2.1/debian/rules	2015-07-26 05:33:50.000000000 +0000
+++ bumblebee-3.2.1/debian/rules	2015-08-15 06:39:10.000000000 +0000
@@ -26,11 +26,21 @@
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/bumblebee/
 	
+override_dh_install:
+	dh_install
+	
 	# Install bash-completion file to non-obsolete directory
 	mkdir -p debian/bumblebee/usr/share/bash-completion/completions/
 	mv debian/bumblebee/etc/bash_completion.d/bumblebee \
 	   debian/bumblebee/usr/share/bash-completion/completions/
 	rm -rf debian/bumblebee/etc/bash_completion.d/
+	
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
+	# On Ubuntu modprobe remove line is not present, which breaks module
+	# unloading; https://github.com/Bumblebee-Project/Bumblebee/issues/681
+	echo "# Workaround to make sure nvidia-uvm is removed as well" >> debian/bumblebee/usr/share/bumblebee/default-conf/bumblebee.conf
+	echo "remove nvidia rmmod nvidia-uvm nvidia" >> debian/bumblebee/usr/share/bumblebee/default-conf/bumblebee.conf
+endif
 
 override_dh_installinit:
 	dh_installinit --name=bumblebeed