diff --git a/package/streamripper/streamripper.mk b/package/streamripper/streamripper.mk
index e4d1c93d..e1b21c3d 100644
--- a/package/streamripper/streamripper.mk
+++ b/package/streamripper/streamripper.mk
@@ -4,6 +4,11 @@
 #
 ################################################################################
 
+STREAMRIPPER_VERSION = ni-git
+STREAMRIPPER_DIR = $(NI_STREAMRIPPER)
+STREAMRIPPER_SOURCE = $(NI_STREAMRIPPER)
+STREAMRIPPER_SITE = https://github.com/neutrino-images
+
 STREAMRIPPER_DEPENDENCIES = libvorbisidec libmad glib2
 
 STREAMRIPPER_AUTORECONF = YES
@@ -18,13 +23,19 @@ STREAMRIPPER_CONF_OPTS = \
 	--with-included-argv=yes \
 	--with-included-libmad=no
 
-streamripper: $(STREAMRIPPER_DEPENDENCIES) | $(TARGET_DIR)
-	$(REMOVE)/$(NI_STREAMRIPPER)
-	tar -C $(SOURCE_DIR) --exclude-vcs -cp $(NI_STREAMRIPPER) | tar -C $(BUILD_DIR) -x
-	$(CHDIR)/$(NI_STREAMRIPPER); \
+define STREAMRIPPER_INSTALL_BINARY
+	$(INSTALL_EXEC) -D $(PKG_BUILD_DIR)/streamripper $(TARGET_bindir)/streamripper
+endef
+STREAMRIPPER_PRE_FOLLOWUP_HOOKS += STREAMRIPPER_INSTALL_BINARY
+
+define STREAMRIPPER_INSTALL_SCRIPT
+	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/streamripper.sh $(TARGET_bindir)/streamripper.sh
+endef
+STREAMRIPPER_TARGET_FINALIZE_HOOKS += STREAMRIPPER_INSTALL_SCRIPT
+
+streamripper: | $(TARGET_DIR)
+	$(call PREPARE)
+	$(CHDIR)/$($(PKG)_DIR); \
 		$(CONFIGURE); \
-		$(MAKE); \
-		$(INSTALL_EXEC) -D streamripper $(TARGET_bindir)/streamripper
-	$(INSTALL_EXEC) $(PKG_FILES_DIR)/streamripper.sh $(TARGET_bindir)/
-	$(REMOVE)/$(NI_STREAMRIPPER)
-	$(TOUCH)
+		$(MAKE)
+	$(call TARGET_FOLLOWUP)