diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8140e37..b8bb1d90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 Features
 
-- Koz Ross added implementations of SRFI 28 and 60.
+- Koz Ross added implementations of SRFI 28, 60 and 121.
 - Allow a program to have more than one `import` declaration. A program can now also use `cond-expand` to selectively expand `import` declarations.
 - Added the `-A` and `-I` compiler options from SRFI 138 to `cyclone`:
 
diff --git a/Makefile b/Makefile
index 5aa724b4..6fb3a4c2 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ COBJECTS = $(SLDFILES:.sld=.o)
 HEADERS = $(HEADER_DIR)/runtime.h $(HEADER_DIR)/types.h
 TEST_SRC = $(TEST_DIR)/unit-tests.scm \
 					 $(TEST_DIR)/srfi-28-tests.scm \
-					 $(TEST_DIR)/srfi-60-tests.scm
+					 $(TEST_DIR)/srfi-60-tests.scm \
+					 $(TEST_DIR)/srfi-121-tests.scm
 TESTS = $(basename $(TEST_SRC))
 
 # Primary rules (of interest to an end user)
@@ -227,6 +228,7 @@ bootstrap : icyc libs
 	cp srfi/111.c $(BOOTSTRAP_DIR)/srfi
 	cp srfi/113.c $(BOOTSTRAP_DIR)/srfi
 	cp srfi/117.c $(BOOTSTRAP_DIR)/srfi
+	cp srfi/121.c $(BOOTSTRAP_DIR)/srfi
 	cp srfi/128.c $(BOOTSTRAP_DIR)/srfi
 	cp srfi/128.meta $(BOOTSTRAP_DIR)/srfi
 	cp srfi/132.c $(BOOTSTRAP_DIR)/srfi
diff --git a/tests/srfi-60-tests.scm b/tests/srfi-60-tests.scm
index 59189538..c4e27f55 100644
--- a/tests/srfi-60-tests.scm
+++ b/tests/srfi-60-tests.scm
@@ -1,3 +1,24 @@
+#|
+ | Copyright (c) 2017 Koz Ross 
+ |
+ | Permission is hereby granted, free of charge, to any person obtaining a copy of
+ | this software and associated documentation files (the "Software"), to deal in
+ | the Software without restriction, including without limitation the rights to
+ | use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ | the Software, and to permit persons to whom the Software is furnished to do so,
+ | subject to the following conditions:
+ |
+ | The above copyright notice and this permission notice shall be included in all
+ | copies or substantial portions of the Software.
+ |
+ | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ | FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ | COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ | IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ |#
+
 (import 
   (scheme base)
   (srfi 60)