diff --git a/make/environment.mk b/make/environment.mk
index 261eec62..ebd927ce 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -312,6 +312,7 @@ NI_LINUX-KERNEL		= ni-linux-kernel
 NI_LOGO-STUFF		= ni-logo-stuff
 NI_OFGWRITE		= ni-ofgwrite
 NI_OPENTHREADS		= ni-openthreads
+NI_RTMPDUMP		= ni-rtmpdump
 NI_STREAMRIPPER		= ni-streamripper
 
 # ffmpeg/master is currently not mature enough for daily use
diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index 042c9bfe..0e61bdf6 100644
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -92,6 +92,7 @@ $(SOURCE_DIR)/$(NI_DRIVERS-BIN) \
 $(SOURCE_DIR)/$(NI_LOGO-STUFF) \
 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
 $(SOURCE_DIR)/$(NI_OPENTHREADS) \
+$(SOURCE_DIR)/$(NI_RTMPDUMP) \
 $(SOURCE_DIR)/$(NI_STREAMRIPPER):
 	cd $(SOURCE_DIR) && \
 		git clone $(NI_GIT)/$(notdir $@).git
@@ -194,4 +195,5 @@ ni-git: \
 	$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
 	$(SOURCE_DIR)/$(NI_OFGWRITE) \
 	$(SOURCE_DIR)/$(NI_OPENTHREADS) \
+	$(SOURCE_DIR)/$(NI_RTMPDUMP) \
 	$(SOURCE_DIR)/$(NI_STREAMRIPPER)
diff --git a/make/system-libs.mk b/make/system-libs.mk
index e3683a4f..f267df32 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -880,10 +880,10 @@ $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/pugixml-$(PUGIXML_VER)
 	touch $@
 
-$(D)/librtmp: $(D)/zlib $(D)/openssl | $(TARGET_DIR)
-	$(REMOVE)/rtmpdump
-	git clone https://bitbucket.org/neutrino-images/ni-rtmpdump.git $(BUILD_TMP)/rtmpdump
-	set -e; cd $(BUILD_TMP)/rtmpdump; \
+$(D)/librtmp: $(D)/zlib $(D)/openssl $(SOURCE_DIR)/$(NI_RTMPDUMP) | $(TARGET_DIR)
+	$(REMOVE)/$(NI_RTMPDUMP)
+	tar -C $(SOURCE_DIR) -cp $(NI_RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x
+	set -e; cd $(BUILD_TMP)/$(NI_RTMPDUMP); \
 		make CROSS_COMPILE=$(TARGET)- XCFLAGS="-I$(TARGET_DIR)/include -L$(TARGET_DIR)/lib" LDFLAGS="-L$(TARGET_DIR)/lib" prefix=$(TARGET_DIR);\
 		make install DESTDIR=$(TARGET_DIR) prefix="" mandir=/.remove ;\
 		rm -rf $(TARGET_DIR)/.remove
@@ -891,7 +891,7 @@ $(D)/librtmp: $(D)/zlib $(D)/openssl | $(TARGET_DIR)
 		rm -rf $(TARGET_DIR)/sbin/rtmpsrv
 		rm -rf $(TARGET_DIR)/sbin/rtmpsuck
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/librtmp.pc
-	$(REMOVE)/rtmpdump
+	$(REMOVE)/$(NI_RTMPDUMP)
 	touch $@
 
 $(D)/libtirpc: $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2 | $(TARGET_DIR)
diff --git a/make/update.mk b/make/update.mk
index 078e01c7..bb5783d5 100644
--- a/make/update.mk
+++ b/make/update.mk
@@ -59,6 +59,7 @@ endif
 	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git pull
 	cd $(SOURCE_DIR)/$(NI_OFGWRITE) && git pull
 	cd $(SOURCE_DIR)/$(NI_OPENTHREADS) && git pull
+	cd $(SOURCE_DIR)/$(NI_RTMPDUMP) && git pull
 	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git pull
 
 
@@ -88,6 +89,7 @@ endif
 	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git push
 	cd $(SOURCE_DIR)/$(NI_OFGWRITE) && git push
 	cd $(SOURCE_DIR)/$(NI_OPENTHREADS) && git push
+	cd $(SOURCE_DIR)/$(NI_RTMPDUMP) && git push
 	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git push
 
 PHONY += update-self update-neutrino