diff --git a/nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch b/nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch
new file mode 100644
index 0000000..60f892b
--- /dev/null
+++ b/nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch
@@ -0,0 +1,11 @@
+--- nfs-ganesha-2.4-dev-17/src/FSAL/fsal_helper.c.orig	2016-05-10 07:22:14.695046076 -0400
++++ nfs-ganesha-2.4-dev-17/src/FSAL/fsal_helper.c	2016-05-10 07:23:13.590046076 -0400
+@@ -1442,7 +1442,7 @@
+ 	status = get_dirent(obj, &cb_parms, cookie, state);
+ 	if (status.major == ERR_FSAL_CROSS_JUNCTION) {
+ 		struct fsal_obj_handle *junction_obj;
+-		struct gsh_export *junction_export;
++		struct gsh_export *junction_export = NULL;
+ 
+ 		PTHREAD_RWLOCK_rdlock(&obj->state_hdl->state_lock);
+ 
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index bbb58de..36f76b8 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -81,15 +81,16 @@
 
 Name:		nfs-ganesha
 Version:	2.4.0
-%global		dev dev14
-%global		dash_dev_version 2.4-dev-14
-Release:	0.4%{?dev:%{dev}}%{?dist}
+%global		dev dev17
+%global		dash_dev_version 2.4-dev-17
+Release:	0.5%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 Group:		Applications/System
 License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
 Source0:	https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
+Patch0:		nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch
 
 BuildRequires:	cmake
 BuildRequires:	bison
@@ -346,6 +347,7 @@ be used with NFS-Ganesha to support Gluster
 %prep
 %setup -q -n %{name}-%{dash_dev_version}
 rm -rf contrib/libzfswrapper
+%patch0 -p1
 
 %build
 cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug		\
@@ -612,6 +614,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
 %endif
 
 %changelog
+* Tue May 10 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.5dev17
+- 2.4-dev-17
+
 * Fri Apr 8 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.4dev14
 - 2.4-dev-14
 
diff --git a/sources b/sources
index 0e5feb3..4130f1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-202ea149815c052384c62bde39d06717  nfs-ganesha-2.4-dev-14.tar.gz
+26b8c5411c131e33a273afd828680d76  nfs-ganesha-2.4-dev-17.tar.gz