diff --git a/Patches/udpxy-1.0.23-10.patch b/Patches/udpxy-612d227.patch
similarity index 100%
rename from Patches/udpxy-1.0.23-10.patch
rename to Patches/udpxy-612d227.patch
diff --git a/make/contrib-apps.mk b/make/contrib-apps.mk
index 751612e1..bddddca8 100644
--- a/make/contrib-apps.mk
+++ b/make/contrib-apps.mk
@@ -1529,18 +1529,19 @@ $(D)/dvbsnoop: $(D)/bootstrap $(D)/kernel $(ARCHIVE)/$(DVBSNOOP_SOURCE)
 #
 # udpxy
 #
-UDPXY_VER = 1.0.23-10
-UDPXY_SOURCE = udpxy-src.tar.gz
+UDPXY_VER = 612d227
+UDPXY_SOURCE = udpxy-$(UDPXY_VER).tar.bz2
+UDPXY_URL = https://github.com/pcherenkov/udpxy.git
 UDPXY_PATCH = udpxy-$(UDPXY_VER).patch
 
 $(ARCHIVE)/$(UDPXY_SOURCE):
-	$(WGET) http://www.udpxy.com/download/udpxy/$(UDPXY_SOURCE)
+	$(SCRIPTS_DIR)/get-git-archive.sh $(UDPXY_URL) $(UDPXY_VER) $(notdir $@) $(ARCHIVE)
 
 $(D)/udpxy: $(D)/bootstrap $(ARCHIVE)/$(UDPXY_SOURCE)
 	$(START_BUILD)
 	$(REMOVE)/udpxy-$(UDPXY_VER)
 	$(UNTAR)/$(UDPXY_SOURCE)
-	set -e; cd $(BUILD_TMP)/udpxy-$(UDPXY_VER); \
+	set -e; cd $(BUILD_TMP)/udpxy-$(UDPXY_VER)/chipmunk; \
 		$(call apply_patches,$(UDPXY_PATCH)); \
 		$(BUILDENV) \
 		$(MAKE) CC=$(TARGET)-gcc CCKIND=gcc; \