diff --git a/module/Makefile.am b/module/Makefile.am
index f5cde7d0f..5bfb82822 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -258,6 +258,7 @@ SRFI_SOURCES = \
 RNRS_SOURCES =					\
   rnrs/6/base.scm				\
   rnrs/6/control.scm				\
+  rnrs/arithmetic/6/bitwise.scm			\
   rnrs/bytevector.scm				\
   rnrs/io/ports.scm
 
diff --git a/module/rnrs/arithmetic/6/bitwise.scm b/module/rnrs/arithmetic/6/bitwise.scm
index b21946645..bb3a20797 100644
--- a/module/rnrs/arithmetic/6/bitwise.scm
+++ b/module/rnrs/arithmetic/6/bitwise.scm
@@ -40,12 +40,14 @@
 	  bitwise-rotate-bit-field
 	  bitwise-reverse-bit-field)
   (import (rnrs base (6))
+	  (rnrs control (6))
 	  (rename (only (guile) lognot 
 			        logand 
 				logior
 				logxor 
 				logcount 
-				logbit? 
+				logbit?
+				modulo
 				ash)
 		  (lognot bitwise-not)
 		  (logand bitwise-and) 
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index ca220d270..2fa796d11 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -76,6 +76,7 @@ SCM_TESTS = tests/00-initial-env.test		\
 	    tests/q.test			\
 	    tests/r4rs.test			\
 	    tests/r5rs_pitfall.test		\
+	    tests/r6rs-arithmetic-bitwise.test	\
 	    tests/r6rs-control.test		\
 	    tests/r6rs-ports.test		\
 	    tests/rnrs-libraries.test		\