diff --git a/plugins/String/config.py b/plugins/String/config.py
index d451b6a9e..6ebec26de 100644
--- a/plugins/String/config.py
+++ b/plugins/String/config.py
@@ -53,4 +53,11 @@ conf.registerGlobalValue(String.levenshtein, 'max',
     this variable, to limit the size of arguments passed to the levenshtein
     command.""")))
 
+conf.registerGroup(String, 're')
+conf.registerGlobalValue(String.re, 'timeout',
+    registry.PositiveFloat(0.1, """Determines the maximum time, in seconds, that
+    a regular expression is given to execute before being terminated. Since
+    there is a possibility that user input for the re command can cause it to
+    eat up large amounts of ram or cpu time, it's a good idea to keep this 
+    low. Most normal regexps should not take very long at all."""))
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/src/version.py b/src/version.py
index a63e60d0e..b9b43b32f 100644
--- a/src/version.py
+++ b/src/version.py
@@ -1,3 +1,3 @@
 """stick the various versioning attributes in here, so we only have to change
 them once."""
-version = '0.83.4.1+limnoria (2011-08-13T01:56:21+0200)'
+version = '0.83.4.1+limnoria (2011-08-13T01:57:03+0200)'