diff --git a/make/system-tools-extra.mk b/make/system-tools-extra.mk
index 5306ac5..f3faddc 100644
--- a/make/system-tools-extra.mk
+++ b/make/system-tools-extra.mk
@@ -507,8 +507,6 @@ $(D)/libglib: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(D)/gettext $(D)/lib
                        ; \
                $(MAKE) all; \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
-       mv $(TARGETLIB)/glib-2.0/include/*.h $(TARGETINCLUDE)
-       rm -rf $(TARGETLIB)/glib-2.0
        rm -rf $(TARGETLIB)/gio
        rm -rf $(TARGETPREFIX)/bin/gapplication
        rm -rf $(TARGETPREFIX)/bin/gdbus*
@@ -564,17 +562,22 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGETPREFIX)

 # broken (final link does not find glib2 stuff)
 $(D)/mc: $(ARCHIVE)/mc-$(MC-VER).tar.xz $(D)/libglib $(D)/libncurses | $(TARGETPREFIX)
+       $(REMOVE)/mc-$(MC-VER)
        $(UNTAR)/mc-$(MC-VER).tar.xz
        pushd $(BUILD_TMP)/mc-$(MC-VER); \
                autoreconf -fi; \
                $(CONFIGURE) \
                        --prefix= \
                        --mandir=/.remove \
+                       --enable-static \
+                       --disable-shared \
+                       --enable-silent-rules \
+                       --enable-maintainer-mode \
                        --with-screen=ncurses \
                        --disable-vfs-sftp \
                        --without-x \
                ; \
-               $(MAKE) all
-               #$(MAKE) install DESTDIR=$(TARGETPREFIX)
+               $(MAKE) all; \
+               $(MAKE) install DESTDIR=$(TARGETPREFIX)
        #$(REMOVE)/mc-$(MC-VER)
        #touch $@