3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c998b16398..2a12e89050 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 	in a separate -lregex. Include also camel-provider's CFLAGS and
 	LIBS for IMPORTERS. Expand win32/Makefile.
 
+	* plugin.mk: Expand also @SOEXT@.
+
+	* server.mk: Expand also @SOEXT@ and @EXEEXT@.
+
 	* win32/README
 	* win32/Makefile.am
 	* win32/dummy.la
diff --git a/plugin.mk b/plugin.mk
index 812ab38cc7..2df8c53d0e 100644
--- a/plugin.mk
+++ b/plugin.mk
@@ -1,5 +1,5 @@
 %.eplug: %.eplug.in
-	sed -e 's|\@PLUGINDIR\@|$(plugindir)|' $< > $@
+	sed -e 's|\@PLUGINDIR\@|$(plugindir)|' -e 's|\@SOEXT\@|$(SOEXT)|' $< > $@
 
 %.eplug.in: %.eplug.xml
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
diff --git a/server.mk b/server.mk
index acdc12bb65..f5152730d3 100644
--- a/server.mk
+++ b/server.mk
@@ -4,6 +4,8 @@
 	-e 's|\@COMPONENTDIR\@|$(componentdir)|' 		\
 	-e 's|\@IMPORTERSDIR\@|$(importersdir)|' 		\
 	-e 's|\@VERSION\@|$(BASE_VERSION)|' 			\
+	-e 's|\@EXEEXT\@|$(EXEEXT)|'				\
+	-e 's|\@SOEXT\@|$(SOEXT)|'				\
 	-e 's|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|' $< > $@
 
 %_$(BASE_VERSION).server: %.server