diff --git a/bower.json b/bower.json
index fcbe71d9..ef04e00b 100644
--- a/bower.json
+++ b/bower.json
@@ -28,7 +28,7 @@
     "devicejs": "0.1.16",
     "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
     "zocial-less": "1.0.0",
-	"swagger-ui": "2.0.24"
+	"swagger-ui": "2.1.5-M1"
   },
   "resolutions": {
     "angular": "1.3.6",
diff --git a/gulpfile.js b/gulpfile.js
index e2403641..cb78cf28 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -98,6 +98,7 @@ gulp.task('serve', function() {
 		port : 8082,
 		livereload : true,
 		middleware : function() {
+			var api = '^/api/(.*)$ http://localhost:8083/rest/$1 [P]';
 			var rest = '^/rest/(.*)$ http://localhost:8083/rest/$1 [P]';
 			var next = '^/next(.*)$ http://localhost:8083/next$1 [P]';
 			var logout = '^/logout$ http://localhost:8083/logout [P]';
diff --git a/pom.xml b/pom.xml
index 4ab37036..2b6efca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,21 +209,13 @@
 
 		<dependency>
 			<groupId>com.wordnik</groupId>
-			<artifactId>swagger-jaxrs_2.10</artifactId>
-			<version>1.3.12</version>
+			<artifactId>swagger-jaxrs</artifactId>
+			<version>1.5.1-M1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.ws.rs</groupId>
 					<artifactId>jsr311-api</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.module</groupId>
-					<artifactId>jackson-module-scala_2.10</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.scala-lang</groupId>
-					<artifactId>scalap</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 
diff --git a/src/main/app/api/index.html b/src/main/app/api/index.html
index 05a25131..b78abbcf 100644
--- a/src/main/app/api/index.html
+++ b/src/main/app/api/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Swagger UI</title>
-  <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
+  <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
   <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
@@ -12,25 +12,23 @@
   <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
   <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
   <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-  <script src='lib/handlebars-1.0.0.js' type='text/javascript'></script>
+  <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
   <script src='lib/underscore-min.js' type='text/javascript'></script>
   <script src='lib/backbone-min.js' type='text/javascript'></script>
-  <script src='lib/swagger.js' type='text/javascript'></script>
+  <script src='lib/swagger-client.js' type='text/javascript'></script>
   <script src='swagger-ui.js' type='text/javascript'></script>
   <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
+  <script src='lib/marked.js' type='text/javascript'></script>
 
   <!-- enabling this will enable oauth2 implicit scope support -->
   <script src='lib/swagger-oauth.js' type='text/javascript'></script>
-
   <script type="text/javascript">
     $(function () {
       window.swaggerUi = new SwaggerUi({
-      url: "../rest/api-docs",
+      url: "../rest/swagger.json",
       dom_id: "swagger-ui-container",
       supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
       onComplete: function(swaggerApi, swaggerUi){
-        log("Loaded SwaggerUI");
-
         if(typeof initOAuth == "function") {
           /*
           initOAuth({
diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index b5d021ec..09c5c4e7 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -57,19 +57,13 @@ import com.commafeed.frontend.servlet.CustomCssServlet;
 import com.commafeed.frontend.servlet.LogoutServlet;
 import com.commafeed.frontend.servlet.NextUnreadServlet;
 import com.commafeed.frontend.session.SessionHelperFactoryProvider;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.TypeLiteral;
-import com.wordnik.swagger.config.ConfigFactory;
-import com.wordnik.swagger.config.ScannerFactory;
-import com.wordnik.swagger.config.SwaggerConfig;
-import com.wordnik.swagger.jaxrs.config.DefaultJaxrsScanner;
-import com.wordnik.swagger.jaxrs.listing.ApiDeclarationProvider;
-import com.wordnik.swagger.jaxrs.listing.ApiListingResourceJSON;
-import com.wordnik.swagger.jaxrs.listing.ResourceListingProvider;
-import com.wordnik.swagger.jaxrs.reader.DefaultJaxrsApiReader;
-import com.wordnik.swagger.reader.ClassReaders;
+import com.wordnik.swagger.jaxrs.config.BeanConfig;
+import com.wordnik.swagger.jaxrs.listing.ApiListingResource;
 
 public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 
@@ -159,14 +153,15 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		environment.lifecycle().manage(injector.getInstance(FeedRefreshUpdater.class));
 
 		// Swagger
-		environment.jersey().register(new ApiListingResourceJSON());
-		environment.jersey().register(new ApiDeclarationProvider());
-		environment.jersey().register(new ResourceListingProvider());
-		ScannerFactory.setScanner(new DefaultJaxrsScanner());
-		ClassReaders.setReader(new DefaultJaxrsApiReader());
-		SwaggerConfig swaggerConfig = ConfigFactory.config();
-		swaggerConfig.setApiVersion("1");
+		environment.jersey().register(new ApiListingResource());
+		environment.getObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+		BeanConfig swaggerConfig = new BeanConfig();
+		swaggerConfig.setTitle("CommaFeed");
+		swaggerConfig.setVersion("1");
 		swaggerConfig.setBasePath("/rest");
+		swaggerConfig.setResourcePackage("com.commafeed.frontend.model");
+		swaggerConfig.setScan(true);
 
 		// cache configuration
 		// prevent caching on REST resources, except for favicons
