diff --git a/org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/i18n/EcdResouceBundle.java b/org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/i18n/EcdResouceBundle.java
index d757c1f4..5abb17ca 100644
--- a/org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/i18n/EcdResouceBundle.java
+++ b/org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/i18n/EcdResouceBundle.java
@@ -21,7 +21,10 @@ public class EcdResouceBundle {
 	public EcdResouceBundle(Class<?> messagesClass) {
 		ClassLoader classLoader = messagesClass.getClassLoader();
 		Locale targetLocale = Locale.getDefault();
-		String resourceBundleName = messagesClass.getPackageName() + ".messages";
+		// Java 8 workaround for messagesClass.getpackageName()
+		String messageClassName = messagesClass.getName();
+		String packageName = messageClassName.substring(0, messageClassName.lastIndexOf("."));
+		String resourceBundleName = packageName + ".messages";
 		this.resourceBundle = ResourceBundle.getBundle(resourceBundleName, targetLocale, classLoader);
 	}