diff --git a/Makefile b/Makefile
index ffb5db823..81d718430 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ ENABLE_LIBYOSYS := 0
 ENABLE_GPROF := 0
 ENABLE_NDEBUG := 0
 LINK_CURSES := 0
+LINK_TERMCAP := 0
 
 # clang sanitizers
 SANITIZER =
@@ -213,6 +214,10 @@ ifeq ($(LINK_CURSES),1)
 LDLIBS += -lcurses
 ABCMKARGS += "ABC_READLINE_LIBRARIES=-lcurses -lreadline"
 endif
+ifeq ($(LINK_TERMCAP),1)
+LDLIBS += -ltermcap
+ABCMKARGS += "ABC_READLINE_LIBRARIES=-lreadline -ltermcap"
+endif
 ifeq ($(CONFIG),mxe)
 LDLIBS += -ltermcap
 endif
diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 3c824b8c3..4199e6f3a 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -147,7 +147,7 @@ struct hash_ptr_ops {
 		return a == b;
 	}
 	static inline unsigned int hash(const void *a) {
-		return (unsigned long)a;
+		return (intptr_t)a;
 	}
 };