diff --git a/src/Makefile.am b/src/Makefile.am
index 60649913a..28e50cb24 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -349,10 +349,9 @@ if WINCONSOLE
 LIBS += -lpsapi -lShlwapi
 endif
 
-## FIXME: Should be allwed, but fails within MSYS2
-#if SHWIN
-#LIBS += -lpsapi -lShlwapi
-#endif
+if SHWIN
+LIBS += -lpsapi -lShlwapi
+endif
 
 CLEANFILES = ngspice.idx spinit tclspinit pkgIndex.tcl
 
diff --git a/src/xspice/cmpp/Makefile.am b/src/xspice/cmpp/Makefile.am
index c858a3348..d8ee5cafd 100644
--- a/src/xspice/cmpp/Makefile.am
+++ b/src/xspice/cmpp/Makefile.am
@@ -24,6 +24,10 @@ if WINCONSOLE
 cmpp_LDADD = -lShlwapi
 endif
 
+if SHWIN
+cmpp_LDADD = -lShlwapi
+endif
+
 mod_lex.c : mod_lex.l
 	$(am__skiplex) $(LEXCOMPILE) -o $@ $<