diff --git a/Makefile.in b/Makefile.in
index 30ab6871..4000c161 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -207,7 +207,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/src/libsodium/include/sodium/version.h.in \
 	AUTHORS ChangeLog THANKS build-aux/compile \
 	build-aux/config.guess build-aux/config.sub \
-	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
+	build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
+	compile config.guess config.sub depcomp install-sh ltmain.sh \
+	missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
diff --git a/configure b/configure
index 6f0fa087..79939ccf 100755
--- a/configure
+++ b/configure
@@ -7281,7 +7281,7 @@ if test "x$enable_ssp" != "xno"; then :
 
 
 case $host_os in #(
-  cygwin*|mingw*|msys|pw32*|cegcc*) :
+  cygwin*|mingw*|msys|pw32*|cegcc*|haiku) :
       ;; #(
   *) :