diff --git a/pom.xml b/pom.xml
index d520dda1..4ab37036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<dropwizard.version>0.8.0-rc2</dropwizard.version>
+		<dropwizard.version>0.8.0-rc3</dropwizard.version>
 		<guice.version>4.0-beta5</guice.version>
 		<querydsl.version>3.6.1</querydsl.version>
 		<rome.version>1.5.0</rome.version>
@@ -205,7 +205,6 @@
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-forms</artifactId>
 			<version>${dropwizard.version}</version>
-			<type>pom</type>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index 21957d70..b5d021ec 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -3,6 +3,7 @@ package com.commafeed;
 import io.dropwizard.Application;
 import io.dropwizard.assets.AssetsBundle;
 import io.dropwizard.db.DataSourceFactory;
+import io.dropwizard.forms.MultiPartBundle;
 import io.dropwizard.hibernate.HibernateBundle;
 import io.dropwizard.migrations.MigrationsBundle;
 import io.dropwizard.server.DefaultServerFactory;
@@ -24,7 +25,6 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
 import org.eclipse.jetty.server.session.SessionHandler;
-import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.hibernate.cfg.AvailableSettings;
 
 import com.commafeed.backend.feed.FeedRefreshTaskGiver;
@@ -108,6 +108,7 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		});
 
 		bootstrap.addBundle(new AssetsBundle("/assets/", "/", "index.html"));
+		bootstrap.addBundle(new MultiPartBundle());
 	}
 
 	@Override
@@ -134,9 +135,6 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		environment.jersey().register(injector.getInstance(ServerREST.class));
 		environment.jersey().register(injector.getInstance(UserREST.class));
 
-		// @FormDataParam support
-		environment.jersey().register(MultiPartFeature.class);
-
 		// Servlets
 		environment.servlets().addServlet("next", injector.getInstance(NextUnreadServlet.class)).addMapping("/next");
 		environment.servlets().addServlet("logout", injector.getInstance(LogoutServlet.class)).addMapping("/logout");