diff --git a/eclipse-epic-enable-module-starter.patch b/eclipse-epic-enable-module-starter.patch
new file mode 100644
index 0000000..70dd7dc
--- /dev/null
+++ b/eclipse-epic-enable-module-starter.patch
@@ -0,0 +1,25 @@
+Index: src/org/epic/perleditor/preferences/PreferenceConstants.java
+===================================================================
+RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/preferences/PreferenceConstants.java,v
+retrieving revision 1.18
+diff -u -r1.18 PreferenceConstants.java
+--- src/org/epic/perleditor/preferences/PreferenceConstants.java	10 Aug 2008 13:38:06 -0000	1.18
++++ src/org/epic/perleditor/preferences/PreferenceConstants.java	16 Mar 2009 23:42:13 -0000
+@@ -667,7 +667,7 @@
+         store.setDefault(BROWSER_START_URL, "http://"); //$NON-NLS-1$
+         
+         store.setDefault(DEBUG_INTERPRETER_TYPE, DEBUG_INTERPRETER_TYPE_STANDARD);
+-        store.setDefault(DEBUG_PERL_EXECUTABLE, "perl"); //$NON-NLS-1$
++        store.setDefault(DEBUG_PERL_EXECUTABLE, "perl -T"); //$NON-NLS-1$
+         store.setDefault(DEBUG_SHOW_WARNINGS, true);
+         store.setDefault(DEBUG_TAINT_MODE, false);
+         store.setDefault(DEBUG_DEBUG_CONSOLE, false);
+@@ -745,7 +745,7 @@
+         store.setDefault(EDITOR_NUMBER_COLOR_BOLD, false);
+         store.setDefault(EDITOR_INVALID_COLOR_BOLD, false);
+         
+-        store.setDefault(MODULE_STARTER_ENABLED, false);
++        store.setDefault(MODULE_STARTER_ENABLED, true);
+         store.setDefault(MODULE_STARTER_DEFAULT_LOCATION, true);
+         store.setDefault(MODULE_STARTER_LOCATION, ""); //$NON-NLS-1$
+         store.setDefault(MODULE_STARTER_OVERRIDE_CONFIG, true);
diff --git a/eclipse-epic.spec b/eclipse-epic.spec
index 9d26171..8f3848e 100644
--- a/eclipse-epic.spec
+++ b/eclipse-epic.spec
@@ -3,7 +3,7 @@
 
 Name:      eclipse-epic
 Version:   0.6.31
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Perl Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -15,6 +15,9 @@ URL:       http://www.epic-ide.org/
 Source0:   epic-%{version}.tar.gz
 Source1:   get-epic.sh
 
+# enable module starter and taint checking by default
+Patch0:    %{name}-enable-module-starter.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{gcj_support}
@@ -42,6 +45,7 @@ Requires:         brazil
 Requires:         perl
 Requires:         perl(PadWalker)
 Requires:         perl(Module::Starter)
+Requires:         perl(Test::Simple)
 
 %description
 EPIC is an open source Perl IDE based on the Eclipse platform. Features 
@@ -52,6 +56,11 @@ view and a Perl debugger.
 %prep
 %setup -q -n epic-%{version}
 
+# apply patches
+pushd org.epic.perleditor
+%patch0 -p0
+popd
+
 # ditch bundled libs in favor of building against fedora packaged libs
 rm org.epic.lib/lib/jdom-1.1.jar \
    org.epic.lib/lib/antlr-2.7.5.jar \
@@ -143,6 +152,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Mar 16 2009 Mat Booth <fedora@matbooth.co.uk> 0.6.31-2
+- Add missing dependency Test::Simple for Module::Starter integration.
+- Enable Module::Starter and taint checking by default.
+
 * Sun Mar 1 2009 Mat Booth <fedora@matbooth.co.uk> 0.6.31-1
 - Updated to verion 0.6.31.
 - New feature: Show @_ in variables view.