diff --git a/src/main/java/com/couchbase/lite/router/Router.java b/src/main/java/com/couchbase/lite/router/Router.java
index 02803a72..6bb49164 100644
--- a/src/main/java/com/couchbase/lite/router/Router.java
+++ b/src/main/java/com/couchbase/lite/router/Router.java
@@ -18,6 +18,7 @@
 import com.couchbase.lite.ChangesOptions;
 import com.couchbase.lite.CouchbaseLiteException;
 import com.couchbase.lite.Database;
+import com.couchbase.lite.DatabaseOptions;
 import com.couchbase.lite.Document;
 import com.couchbase.lite.DocumentChange;
 import com.couchbase.lite.Manager;
@@ -1114,8 +1115,23 @@ public Status do_PUT_Database(Database _db, String _docID, String _attachmentNam
         }
 
         try {
-            // note: synchronized
-            db.open();
+        	Map<String, Object> body = getBodyAsDictionary();
+			if (body == null) {
+				Log.i(TAG, "No body for do_PUT_Database");
+				db.open();
+			} else {
+				DatabaseOptions options = new DatabaseOptions();
+				// ForestDB || SQLite
+				if (body.containsKey("storageType")) {
+					String storageType = (String) body.get("storageType");
+					if (storageType.equals(Manager.SQLITE_STORAGE)
+							|| storageType.equals(Manager.FORESTDB_STORAGE)) {
+						Log.d(TAG, "Storage type: " + storageType);
+						options.setStorageType(storageType);
+					}
+				}
+				db.open(options);
+			}
         } catch (CouchbaseLiteException e) {
             return e.getCBLStatus();
         }