diff --git a/fvwm-2.5.24-module_list_remove.patch b/fvwm-2.5.24-module_list_remove.patch
new file mode 100644
index 0000000..c6fbeea
--- /dev/null
+++ b/fvwm-2.5.24-module_list_remove.patch
@@ -0,0 +1,17 @@
+? depcomp
+Index: fvwm/module_list.c
+===================================================================
+RCS file: /home/cvs/fvwm/fvwm/fvwm/module_list.c,v
+retrieving revision 1.30
+diff -u -3 -p -r1.30 module_list.c
+--- fvwm/module_list.c	4 Sep 2007 18:57:28 -0000	1.30
++++ fvwm/module_list.c	9 Feb 2008 07:34:53 -0000
+@@ -175,7 +175,7 @@ static inline fmodule *module_list_remov
+ {
+ 	fmodule_store *current;
+ 
+-	if (module == NULL)
++	if (module == NULL || *list == NULL)
+ 	{
+ 		return NULL;
+ 	}
diff --git a/fvwm.spec b/fvwm.spec
index 6bb4d68..6638a37 100644
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -1,6 +1,6 @@
 Name:		fvwm
 Version:	2.5.24
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -14,6 +14,7 @@ Source2:	http://www.cl.cam.ac.uk/~pz215/fvwm-scripts/scripts/fvwm-xdg-menu.py
 Patch0:		fvwm-2.5.21-xdg-open.patch
 Patch1:		fvwm-2.5.21-mimeopen.patch
 Patch2:		fvwm-2.5.21-menu-generate.patch
+Patch3:		fvwm-2.5.24-module_list_remove.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,6 +48,7 @@ and implement a virtual desktop.
 %patch -P 0 -p1 -b .htmlview
 %patch -P 1 -p1 -b .mimeopen
 %patch -P 2 -p1 -b .menu-generate
+%patch -P 3 -p0 -b .module_list_remove
 
 # Filter out false Perl provides
 cat << \EOF > %{name}-prov
@@ -111,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb  9 2008 Adam Goode <adam@spicenitz.org> - 2.5.24-2
+- Really fix segfault (#382321)
+
 * Sun Dec  2 2007 Adam Goode <adam@spicenitz.org> - 2.5.24-1
 - New upstream release
 - Fixes segfault (#382321)