diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index 80f847c7..03be9a46 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -10,11 +10,12 @@
 
 namespace Mist {
   OutRTMP::OutRTMP(Socket::Connection & conn) : Output(conn) {
+    maxbps = config->getInteger("maxkbps")*128;
     if (config->getString("target").size() && config->getString("target").substr(0, 7) == "rtmp://"){
       streamName = config->getString("streamname");
       std::string pushStr= config->getString("target");
       pushStr = pushStr.substr(7);
-      std::string host, app = "default", streamOut = "default";
+      std::string host, app = "default", streamOut = streamName;
       int port = 1935;
 
       size_t slash = pushStr.find('/');
@@ -35,8 +36,9 @@ namespace Mist {
       if (slash != std::string::npos){
         streamOut = app.substr(slash+1, std::string::npos);
         app = app.substr(0, slash);
-      }else{
-        streamOut = app;
+        if (!streamOut.size()){
+          streamOut = streamName;
+        }
       }
 
       INFO_MSG("About to push stream %s out. Host: %s, port: %d, app: %s, stream: %s", streamName.c_str(), host.c_str(), port, app.c_str(), streamOut.c_str());
@@ -232,7 +234,7 @@ namespace Mist {
   void OutRTMP::init(Util::Config * cfg) {
     Output::init(cfg);
     capa["name"] = "RTMP";
-    capa["desc"] = "Enables the RTMP protocol which is used by Adobe Flash Player.";
+    capa["desc"] = "Enables ingest and output over Adobe's RTMP protocol.";
     capa["deps"] = "";
     capa["url_rel"] = "/play/$";
     capa["codecs"][0u][0u].append("H264");
@@ -254,6 +256,12 @@ namespace Mist {
     capa["methods"][0u]["type"] = "flash/10";
     capa["methods"][0u]["priority"] = 6ll;
     capa["methods"][0u]["player_url"] = "/flashplayer.swf";
+    capa["optional"]["maxkbps"]["name"] = "Max. kbps";
+    capa["optional"]["maxkbps"]["help"] = "Maximum bitrate to allow in the ingest direction, in kilobits per second.";
+    capa["optional"]["maxkbps"]["option"] = "--maxkbps";
+    capa["optional"]["maxkbps"]["short"] = "K";
+    capa["optional"]["maxkbps"]["default"] = (long long)20000;
+    capa["optional"]["maxkbps"]["type"] = "uint";
     cfg->addConnectorOptions(1935, capa);
     config = cfg;
     capa["push_urls"].append("rtmp://*");
@@ -450,6 +458,19 @@ namespace Mist {
     sentHeader = true;
   }
 
+  void OutRTMP::requestHandler(){
+    //If needed, slow down the reading to a rate of maxbps on average
+    static bool slowWarned = false;
+    while (maxbps && (Util::epoch() - myConn.connTime()) && myConn.dataDown() / (Util::epoch() - myConn.connTime()) > maxbps){
+      if (!slowWarned){
+        WARN_MSG("Slowing down connection from %s because rate of %llukbps > %llukbps", getConnectedHost().c_str(), (myConn.dataDown() / (Util::epoch() - myConn.connTime())) / 128, maxbps / 128);
+        slowWarned = true;
+      }
+      Util::sleep(250);
+    }
+    Output::requestHandler();
+  }
+
   void OutRTMP::onRequest() {
     parseChunk(myConn.Received());
   }
diff --git a/src/output/output_rtmp.h b/src/output/output_rtmp.h
index a6d2ad45..8e6aebdf 100644
--- a/src/output/output_rtmp.h
+++ b/src/output/output_rtmp.h
@@ -16,8 +16,10 @@ namespace Mist {
       void sendHeader();
       bool isReadyForPlay();
       static bool listenMode();
+      void requestHandler();
     protected:
       bool isPushing;
+      unsigned int maxbps;
       void parseVars(std::string data);
       std::string app_name;
       void parseChunk(Socket::Buffer & inputBuffer);