diff --git a/CHANGELOG.md b/CHANGELOG.md
index 595b154067..27f6325207 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 4.0.0-beta6 (July 15, 2020)
+- PackageModelViewConfig can now be applied to classes and interfaces in addition to package-info.java
+
 # 4.0.0-beta5 (July 9, 2020)
 Fixes:
 - An occasional processor crash when the option to log timings is enabled
diff --git a/epoxy-annotations/src/main/java/com/airbnb/epoxy/PackageModelViewConfig.java b/epoxy-annotations/src/main/java/com/airbnb/epoxy/PackageModelViewConfig.java
index 6ee7b56de6..b8eabdfa8f 100644
--- a/epoxy-annotations/src/main/java/com/airbnb/epoxy/PackageModelViewConfig.java
+++ b/epoxy-annotations/src/main/java/com/airbnb/epoxy/PackageModelViewConfig.java
@@ -10,7 +10,7 @@
  * package. Also applies to subpackages, unless other package config values are set in those sub
  * packages.
  */
-@Target(ElementType.PACKAGE)
+@Target({ElementType.PACKAGE, ElementType.TYPE})
 @Retention(RetentionPolicy.CLASS)
 public @interface PackageModelViewConfig {
   /**
diff --git a/gradle.properties b/gradle.properties
index 0e025987e2..9249a150ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=4.0.0-beta5
+VERSION_NAME=4.0.0-beta6
 GROUP=com.airbnb.android
 POM_DESCRIPTION=Epoxy is a system for composing complex screens with a ReyclerView in Android.
 POM_URL=https://github.com/airbnb/epoxy