diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
index 86f5efb6e9..6183b3a4c5 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/BaseGeneratedClassHolder.java
@@ -30,6 +30,7 @@
 import javax.lang.model.element.TypeElement;
 
 import org.androidannotations.AndroidAnnotationsEnvironment;
+import org.androidannotations.Option;
 import org.androidannotations.helper.APTCodeModelHelper;
 import org.androidannotations.internal.process.ProcessHolder;
 
@@ -41,6 +42,8 @@
 
 public abstract class BaseGeneratedClassHolder implements GeneratedClassHolder {
 
+	public static final Option OPTION_GENERATE_FINAL_CLASSES = new Option("generateFinalClasses", "true");
+
 	protected final AndroidAnnotationsEnvironment environment;
 	protected JDefinedClass generatedClass;
 	protected AbstractJClass annotatedClass;
@@ -64,10 +67,18 @@ protected void setGeneratedClass() throws Exception {
 			Element enclosingElement = annotatedElement.getEnclosingElement();
 			GeneratedClassHolder enclosingHolder = environment.getGeneratedClassHolder(enclosingElement);
 			String generatedBeanSimpleName = annotatedElement.getSimpleName().toString() + classSuffix();
-			generatedClass = enclosingHolder.getGeneratedClass()._class(PUBLIC | FINAL | STATIC, generatedBeanSimpleName, EClassType.CLASS);
+			int modifier = PUBLIC | STATIC;
+			if (environment.getOptionBooleanValue(OPTION_GENERATE_FINAL_CLASSES)) {
+				modifier |= FINAL;
+			}
+			generatedClass = enclosingHolder.getGeneratedClass()._class(modifier, generatedBeanSimpleName, EClassType.CLASS);
 		} else {
 			String generatedClassQualifiedName = annotatedComponentQualifiedName + classSuffix();
-			generatedClass = getCodeModel()._class(PUBLIC | FINAL, generatedClassQualifiedName, EClassType.CLASS);
+			int modifier = PUBLIC;
+			if (environment.getOptionBooleanValue(OPTION_GENERATE_FINAL_CLASSES)) {
+				modifier |= FINAL;
+			}
+			generatedClass = getCodeModel()._class(modifier, generatedClassQualifiedName, EClassType.CLASS);
 		}
 		codeModelHelper.generify(generatedClass, annotatedElement);
 		setExtends();
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java
index 2d2fd97a3e..35435e5582 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java
@@ -24,6 +24,7 @@
 
 import org.androidannotations.Option;
 import org.androidannotations.helper.ModelConstants;
+import org.androidannotations.holder.BaseGeneratedClassHolder;
 import org.androidannotations.internal.helper.AndroidManifestFinder;
 import org.androidannotations.internal.rclass.ProjectRClassFinder;
 import org.androidannotations.logger.LoggerContext;
@@ -43,6 +44,7 @@ public Options(ProcessingEnvironment processingEnvironment) {
 		addSupportedOption(LoggerContext.OPTION_LOG_LEVEL);
 		addSupportedOption(LoggerContext.OPTION_LOG_APPENDER_CONSOLE);
 		addSupportedOption(LoggerContext.OPTION_LOG_APPENDER_FILE);
+		addSupportedOption(BaseGeneratedClassHolder.OPTION_GENERATE_FINAL_CLASSES);
 	}
 
 	public void addAllSupportedOptions(List<Option> options) {
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/GenerateFinalClassesFlagTest.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/GenerateFinalClassesFlagTest.java
new file mode 100644
index 0000000000..cd9379d22c
--- /dev/null
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/generation/GenerateFinalClassesFlagTest.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.generation;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.androidannotations.internal.AndroidAnnotationProcessor;
+import org.androidannotations.testutils.AAProcessorTestHelper;
+import org.junit.Before;
+import org.junit.Test;
+
+public class GenerateFinalClassesFlagTest extends AAProcessorTestHelper {
+
+	@Before
+	public void setUp() {
+		addManifestProcessorParameter(ActivityInManifest.class);
+		addProcessor(AndroidAnnotationProcessor.class);
+		ensureOutputDirectoryIsEmpty();
+	}
+
+	@Test
+	public void generateFinalClass() throws IOException {
+		addProcessorParameter("generateFinalClasses", "true");
+
+		CompileResult result = compileFiles(ActivityInManifest.class);
+		File generatedFile = toGeneratedFile(ActivityInManifest.class);
+
+		assertCompilationSuccessful(result);
+
+		assertGeneratedClassMatches(generatedFile, "public final class ActivityInManifest_");
+	}
+
+	@Test
+	public void generateNonFinalClass() throws IOException {
+		addProcessorParameter("generateFinalClasses", "false");
+
+		CompileResult result = compileFiles(ActivityInManifest.class);
+		File generatedFile = toGeneratedFile(ActivityInManifest.class);
+
+		assertCompilationSuccessful(result);
+
+		assertGeneratedClassMatches(generatedFile, "public class ActivityInManifest_");
+	}
+}