diff --git a/Makefile.am b/Makefile.am
index abb1d225..cda24a03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ LIBMP_LT_REVISION = 10
 LIBMP_LT_AGE =      1
 
 
-SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd demos tune doc
+SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd demos tune doc yasmbuild
 
 EXTRA_DIST = macos configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf
 
diff --git a/Makefile.in b/Makefile.in
index 0b616011..641975d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -455,7 +455,7 @@ LIBGMPXX_LT_AGE = 1
 LIBMP_LT_CURRENT = 4
 LIBMP_LT_REVISION = 10
 LIBMP_LT_AGE = 1
-SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd demos tune doc
+SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd demos tune doc yasmbuild
 
 # The ansi2knr setups for the build programs are the same as the normal
 # automake ansi2knr rules, but using $(CC_FOR_BUILD) instead of $(CC).
diff --git a/yasmbuild/Makefile b/yasmbuild/Makefile
new file mode 100644
index 00000000..9454f176
--- /dev/null
+++ b/yasmbuild/Makefile
@@ -0,0 +1,3 @@
+default:
+	cd ../yasm; ./configure; make
+all: default