diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cfe5b1b..e25aeaad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ TODO: macro improvements (ref trans.) to support SRFI 128
 
 Features:
 
-- Added support for SRFI 106: a basic socket interface.
+- Added support for SRFI 106: a basic socket interface, and SRFI 128: Comparators.
 - Improved library support to recognize all of the import set forms: `only`, `except`, `prefix`, and `rename`.
 - Allow explicit renaming macros to be declared interactively. This is the first limited support for calling `define-syntax` from `eval`. 
 - Added the `get-environment-variables` function from R7RS.
diff --git a/Makefile b/Makefile
index 77a025cc..26c026f6 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@ SMODULES = \
   srfi/106 \
   srfi/111 \
   srfi/117 \
+  srfi/128 \
   srfi/132 \
   srfi/133
 SLDFILES = $(addsuffix .sld, $(SMODULES))
@@ -154,6 +155,8 @@ bootstrap: icyc
 	cp srfi/106.c $(BOOTSTRAP_DIR)/srfi
 	cp srfi/111.c $(BOOTSTRAP_DIR)/srfi
 	cp srfi/117.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
 	cp srfi/list-queues/*.scm $(BOOTSTRAP_DIR)/srfi/list-queues
 	cp srfi/sorting/*.scm $(BOOTSTRAP_DIR)/srfi/sorting
diff --git a/srfi/128.sld b/srfi/128.sld
index b1f22fb8..8c947d06 100644
--- a/srfi/128.sld
+++ b/srfi/128.sld
@@ -1,4 +1,4 @@
-(define-library (comparators)
+(define-library (srfi 128) ;comparators)
   (import (scheme base))
   (import (scheme case-lambda))
   (import (scheme char) (scheme complex) (scheme inexact))
@@ -16,6 +16,6 @@
   (export =? <? >? <=? >=?)
   (export comparator-if<=>)
   (export %salt%) ;; Temporary workaround since we cannot preserve referential transparency for this
-  (include "comparators-impl.scm")
-  (include "default.scm")
+  (include "comparators/comparators-impl.scm")
+  (include "comparators/default.scm")
 )