diff --git a/acconfig.h b/acconfig.h
index 922bf002ef..84726a9c50 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -7,6 +7,7 @@
 #undef HAVE_LIBMMX
 #undef HAVE_XAUDIO
 #undef HAVE_CSSAUTH
+#undef HAVE_NASM
 
 #undef HAVE_ATOMIC_H
 
diff --git a/config.h.in b/config.h.in
index 53072fdb8f..dc954e2c16 100644
--- a/config.h.in
+++ b/config.h.in
@@ -18,6 +18,7 @@
 #undef HAVE_LIBMMX
 #undef HAVE_XAUDIO
 #undef HAVE_CSSAUTH
+#undef HAVE_NASM
 
 #undef HAVE_ATOMIC_H
 
diff --git a/configure.in b/configure.in
index bc47ddc6ea..75f203daba 100644
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,18 @@ dnl ##############################
 dnl # Do automated configuration #
 dnl ##############################
 
+dnl Check for tools:
+dnl ================
+
+dnl Check for nasm
+AC_PATH_PROG(NASM_PATH, nasm, no)
+if test x$NASM_PATH = xno; then
+  AC_MSG_WARN(Couldn't find nasm)
+else
+  AC_DEFINE(HAVE_NASM)
+  AC_SUBST(NASM_PATH)
+fi
+
 dnl Check for essential libraries first:
 dnl ====================================