diff --git a/src/muparser.mk b/src/muparser.mk
index 1b899ad2..89ef84d5 100644
--- a/src/muparser.mk
+++ b/src/muparser.mk
@@ -6,19 +6,14 @@ $(PKG)_DESCR    := muParser
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.2.5
 $(PKG)_CHECKSUM := 0666ef55da72c3e356ca85b6a0084d56b05dd740c3c21d26d372085aa2c6e708
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_URL      := https://github.com/beltoforion/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_GH_CONF  := beltoforion/muparser/tags,v
 $(PKG)_DEPS     := cc
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, beltoforion/muparser, v)
-endef
-
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --disable-samples \
         --disable-debug
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef
diff --git a/src/muparserx.mk b/src/muparserx.mk
index 32f21981..f91f34f8 100644
--- a/src/muparserx.mk
+++ b/src/muparserx.mk
@@ -4,21 +4,16 @@ PKG             := muparserx
 $(PKG)_WEBSITE  := http://muparserx.beltoforion.de/
 $(PKG)_DESCR    := muParserX
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.0.4
-$(PKG)_CHECKSUM := d7ebcab8cb1de88e6dcba21651db8f6055b3e904c45afc387b06b5f4218dda40
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_URL      := https://github.com/beltoforion/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_VERSION  := 4.0.7
+$(PKG)_CHECKSUM := dd3c68da70a7177224fba015de8a948f2c8e6940d3c6ecde1a87d87ed97d6edf
+$(PKG)_GH_CONF  := beltoforion/muparserx/tags,v
 $(PKG)_DEPS     := cc
 
-define $(PKG)_UPDATE
-    $(call MXE_GET_GITHUB_TAGS, beltoforion/muparserx, v)
-endef
-
 define $(PKG)_BUILD
-    cd '$(1)' && '$(TARGET)-cmake' \
+    cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
         -DBUILD_EXAMPLES=OFF
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \