diff --git a/buildsys.mk.in b/buildsys.mk.in
index 7c89291..b11a9d1 100644
--- a/buildsys.mk.in
+++ b/buildsys.mk.in
@@ -35,7 +35,7 @@ ERLCFLAGS = @ERLCFLAGS@
 OBJCFLAGS = @OBJCFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-PROG_SUFFIX = @PROG_SUFFIX@
+PROG_SUFFIX = @EXEEXT@
 LIB_CPPFLAGS = @LIB_CPPFLAGS@
 LIB_CFLAGS = @LIB_CFLAGS@
 LIB_LDFLAGS = @LIB_LDFLAGS@
diff --git a/m4/buildsys.m4 b/m4/buildsys.m4
index 6ff72bd..30d7191 100644
--- a/m4/buildsys.m4
+++ b/m4/buildsys.m4
@@ -18,20 +18,6 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 dnl POSSIBILITY OF SUCH DAMAGE.
 dnl
 
-AC_DEFUN([BUILDSYS_PROG_SUFFIX], [
-	AC_MSG_CHECKING(for program suffix)
-	case "$target" in
-		*-*-cygwin | *-*-mingw32)
-			PROG_SUFFIX='.exe'
-			;;
-		*)
-			PROG_SUFFIX=''
-			;;
-	esac
-
-	AC_SUBST(PROG_SUFFIX)
-])
-
 AC_DEFUN([BUILDSYS_SHARED_LIB], [
 	AC_MSG_CHECKING(for shared library system)
 	case "$target" in