diff --git a/SOURCES/0001-Bug-1473600-Skip-freezing-autofs-mounts.patch b/SOURCES/0001-Bug-1473600-Skip-freezing-autofs-mounts.patch
new file mode 100644
index 0000000..5966c86
--- /dev/null
+++ b/SOURCES/0001-Bug-1473600-Skip-freezing-autofs-mounts.patch
@@ -0,0 +1,29 @@
+From 581f2d0e93a3aacd7bbf252963d2fbd1720bab15 Mon Sep 17 00:00:00 2001
+From: Dyno Hongjun Fu <hfu@vmware.com>
+Date: Mon, 23 Nov 2015 22:17:59 -0800
+Subject: [PATCH] [Bug 1473600] Skip freezing autofs mounts.
+
+---
+ lib/syncDriver/syncDriverPosix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/syncDriver/syncDriverPosix.c b/lib/syncDriver/syncDriverPosix.c
+index a6e4e1e..400b8a7 100644
+--- a/lib/syncDriver/syncDriverPosix.c
++++ b/lib/syncDriver/syncDriverPosix.c
+@@ -42,10 +42,11 @@ static SyncFreezeFn gBackends[] = {
+ };
+ 
+ static const char *gRemoteFSTypes[] = {
++   "autofs",
++   "cifs",
+    "nfs",
+    "nfs4",
+    "smbfs",
+-   "cifs",
+    "vmhgfs"
+ };
+ 
+-- 
+1.8.3.1
+
diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec
index ece7f5d..914a27e 100644
--- a/SPECS/open-vm-tools.spec
+++ b/SPECS/open-vm-tools.spec
@@ -28,7 +28,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 Group:            Applications/System
 License:          GPLv2
@@ -42,6 +42,9 @@ ExclusiveArch:    x86_64
 ExclusiveArch:    %{ix86} x86_64
 %endif
 
+# Bug 1269956 - [ESX][RHEL7]System with autofs/nfs mounts hangs while taking snapshot, vmtoolsd stuck in autofs backtrace
+Patch1: 0001-Bug-1473600-Skip-freezing-autofs-mounts.patch
+
 BuildRequires:          autoconf
 BuildRequires:          automake
 BuildRequires:          libtool
@@ -107,6 +110,7 @@ VMware virtual machines.
 
 %prep
 %setup -q -n %{name}-%{version}-%{toolsbuild}
+%patch1 -p1
 
 %build
 # Use _DEFAULT_SOURCE to suppress warning until upstream
@@ -244,6 +248,10 @@ fi
 %{_libdir}/libvmtools.so
 
 %changelog
+* Tue May 3 2016 Dave Wysochanski <dwysocha@redaht.com> - 9.10.2-5
+- Skip freezing autofs mounts.
+  resolves: rhbz#1269956
+
 * Fri Aug 14 2015 Richard W.M. Jones <rjones@redhat.com> - 9.10.2-4
 - Enable PrivateTmp for additional hardening
   resolves: rhbz#1253698