diff -Nru ebtables-2.0.10.4/debian/changelog ebtables-2.0.10.4/debian/changelog
--- ebtables-2.0.10.4/debian/changelog	2013-11-22 11:48:35.000000000 +0000
+++ ebtables-2.0.10.4/debian/changelog	2016-11-29 12:27:19.000000000 +0000
@@ -1,3 +1,13 @@
+ebtables (2.0.10.4-3ubuntu2) trusty; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/lockdirfix.patch: Move the lock file to /run instead of
+    /var/lib/ebtables directory (LP: #1645324)
+  * debian/ebtables.postinst: Remove /var/lib/ebtables during upgrade, that
+    directory was created by ebtables but not tracked by the package.
+
+ -- Amad Ali (PGP Amad) <amad.ali@canonical.com>  Mon, 28 Nov 2016 13:29:00 +0100
+
 ebtables (2.0.10.4-3ubuntu1) trusty; urgency=low
 
   * Merge with Debian.  Remaining changes:
diff -Nru ebtables-2.0.10.4/debian/ebtables.postinst ebtables-2.0.10.4/debian/ebtables.postinst
--- ebtables-2.0.10.4/debian/ebtables.postinst	1970-01-01 00:00:00.000000000 +0000
+++ ebtables-2.0.10.4/debian/ebtables.postinst	2016-11-28 16:49:30.000000000 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+# postinst script for ebtables
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+    configure)
+        if dpkg --compare-versions "$2" le-nl "2.0.10.4-3.2~"; then
+            if [ -d /var/lib/ebtables ]; then
+                rmdir --ignore-fail-on-non-empty /var/lib/ebtables
+            fi
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff -Nru ebtables-2.0.10.4/debian/patches/lockdirfix.patch ebtables-2.0.10.4/debian/patches/lockdirfix.patch
--- ebtables-2.0.10.4/debian/patches/lockdirfix.patch	1970-01-01 00:00:00.000000000 +0000
+++ ebtables-2.0.10.4/debian/patches/lockdirfix.patch	2016-11-28 16:48:33.000000000 +0000
@@ -0,0 +1,61 @@
+Description: Move the lockfile from /var/lib/ebtables/lock to /run/ebtables.lock
+
+Reported-by: Zsolt Babindai <zsolt.babindai@ericsson.com>
+Suggested-by: Paul Leveille <Paul.Leveille@stratus.com>
+
+Author: Amad Ali <amad.ali@canonical.com>
+Origin: upstream, commit: e8d3b1a25f284cdf9705b7cf0412281cc9ee3a36
+Bug-Ubuntu: https://launchpad.net/bugs/1645324
+Origin: http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-2.0.10-linkfix.patch
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813760
+
+diff -up ebtables-v2.0.10-4/ebtables.8.lockdirfix ebtables-v2.0.10-4/ebtables.8
+--- ebtables-v2.0.10-4/ebtables.8.lockdirfix	2016-01-18 11:13:21.707069702 -0500
++++ ebtables-v2.0.10-4/ebtables.8	2016-01-18 11:13:40.554953365 -0500
+@@ -1103,7 +1103,7 @@ arp message and the hardware address len
+ .br
+ .SH FILES
+ .I /etc/ethertypes
+-.I /var/lib/ebtables/lock
++.I /run/ebtables.lock
+ .SH ENVIRONMENT VARIABLES
+ .I EBTABLES_ATOMIC_FILE
+ .SH MAILINGLISTS
+diff -up ebtables-v2.0.10-4/INSTALL.lockdirfix ebtables-v2.0.10-4/INSTALL
+--- ebtables-v2.0.10-4/INSTALL.lockdirfix	2016-01-18 11:15:31.458268826 -0500
++++ ebtables-v2.0.10-4/INSTALL	2016-01-18 11:15:53.890130367 -0500
+@@ -31,7 +31,7 @@ WHAT GETS INSTALLED AND WHAT OPTIONS ARE
+   copied to /etc/rc.d/init.d (change with option INITDIR)
+ - The ebtables configuration file (ebtables-config) is copied to /etc/sysconfig
+ - ebtables can use a lock file to enable concurrent execution of the ebtables
+-  tool. The standard location of the lock file is /var/lib/ebtables/lock.
++  tool. The standard location of the lock file is /run/ebtables.lock.
+   Include LOCKFILE=<<path-to-file>> if you want to use another file.
+ 
+ That's all
+diff -up ebtables-v2.0.10-4/libebtc.c.lockdirfix ebtables-v2.0.10-4/libebtc.c
+--- ebtables-v2.0.10-4/libebtc.c.lockdirfix	2016-01-18 11:12:14.347485472 -0500
++++ ebtables-v2.0.10-4/libebtc.c	2016-01-18 11:13:06.515163472 -0500
+@@ -134,8 +134,8 @@ void ebt_list_extensions()
+ }
+ 
+ #ifndef LOCKFILE
+-#define LOCKDIR "/var/lib/ebtables"
+-#define LOCKFILE LOCKDIR"/lock"
++#define LOCKDIR "/run"
++#define LOCKFILE LOCKDIR"/ebtables.lock"
+ #endif
+ static int lockfd = -1, locked;
+ int use_lockfd;
+diff -up ebtables-v2.0.10-4/Makefile.lockdirfix ebtables-v2.0.10-4/Makefile
+--- ebtables-v2.0.10-4/Makefile.lockdirfix	2016-01-18 11:14:10.715767201 -0500
++++ ebtables-v2.0.10-4/Makefile	2016-01-18 11:15:20.506336425 -0500
+@@ -5,7 +5,7 @@ PROGRELEASE:=4
+ PROGVERSION_:=2.0.10
+ PROGVERSION:=$(PROGVERSION_)-$(PROGRELEASE)
+ PROGDATE:=December\ 2011
+-LOCKFILE?=/var/lib/ebtables/lock
++LOCKFILE?=/run/ebtables.lock
+ LOCKDIR:=$(shell echo $(LOCKFILE) | sed 's/\(.*\)\/.*/\1/')/
+ 
+ # default paths
diff -Nru ebtables-2.0.10.4/debian/patches/series ebtables-2.0.10.4/debian/patches/series
--- ebtables-2.0.10.4/debian/patches/series	2013-06-17 15:39:11.000000000 +0000
+++ ebtables-2.0.10.4/debian/patches/series	2016-11-28 16:48:33.000000000 +0000
@@ -3,3 +3,4 @@
 manpage.patch
 compensate-for-missing-aligned-u64.patch
 link_with_no-as-needed.patch
+lockdirfix.patch