diff --git a/debian/changelog b/debian/changelog
index 7489f98..a7643a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libonemind-commons-java-java (1.5.5-2) UNRELEASED; urgency=low
+
+  * New patch enum.patch: rename "enum" to "enumeration", since enum is a
+    keyword in 1.5.
+
+ -- gregor herrmann <gregoa@debian.org>  Mon, 10 Aug 2009 18:51:33 +0200
+
 libonemind-commons-java-java (1.5.5-1) unstable; urgency=low
 
   * Initial release (Closes: #519118)
diff --git a/debian/patches/enum.patch b/debian/patches/enum.patch
new file mode 100644
index 0000000..ef668a9
--- /dev/null
+++ b/debian/patches/enum.patch
@@ -0,0 +1,54 @@
+Author: gregor herrmann <gregoa@debian.org>
+Description: enum is a keyword since 1.5, so let's rename the variable
+
+--- a/src/java/org/onemind/commons/java/util/ServletUtils.java
++++ b/src/java/org/onemind/commons/java/util/ServletUtils.java
+@@ -58,10 +58,10 @@
+         m.put("REQUEST_AUTH_TYPE", req.getAuthType());
+         //m.put("REQUEST_CONTEXT_PATH", req.getContextPath());
+         m.put("REQUEST_COOKIES", req.getCookies());
+-        Enumeration enum = req.getHeaderNames();
+-        while (enum.hasMoreElements())
++        Enumeration enumeration = req.getHeaderNames();
++        while (enumeration.hasMoreElements())
+         {
+-            String header = (String) enum.nextElement();
++            String header = (String) enumeration.nextElement();
+             String value = req.getHeader(header);
+             m.put(header, value);
+         }
+@@ -89,10 +89,10 @@
+     public static Map getExtraRequestEnvironment(HttpServletRequest req)
+     {
+         Map m = new HashMap();
+-        Enumeration enum = req.getAttributeNames();
+-        while (enum.hasMoreElements())
++        Enumeration enumeration = req.getAttributeNames();
++        while (enumeration.hasMoreElements())
+         {
+-            String attr = (String) enum.nextElement();
++            String attr = (String) enumeration.nextElement();
+             m.put(attr, req.getAttribute(attr));
+         }
+         m.put("CHARACTER_ENCODING", req.getCharacterEncoding());
+@@ -146,10 +146,10 @@
+             }
+         } else
+         {
+-            Enumeration enum = req.getParameterNames();
+-            while (enum.hasMoreElements())
++            Enumeration enumeration = req.getParameterNames();
++            while (enumeration.hasMoreElements())
+             {
+-                String key = (String) enum.nextElement();
++                String key = (String) enumeration.nextElement();
+                 String[] value = req.getParameterValues(key);
+                 if (value.length == 0)
+                 {
+@@ -165,4 +165,4 @@
+         }
+         return m;
+     }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ee43cdf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+debian-libs.patch
+enum.patch