diff --git a/base/Makefile.am b/base/Makefile.am
index 91be6872f..6876c4b39 100644
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -5,7 +5,6 @@ lib_LTLIBRARIES = libheimbase.la
 check_PROGRAMS = test_base
 
 libheimbase_la_LDFLAGS = -version-info 1:0:0
-libheimbase_la_CPPFLAGS = $(ROKEN_RENAME)
 
 if versionscript
 libheimbase_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
@@ -23,14 +22,6 @@ dist_libheimbase_la_SOURCES =	\
 	heimqueue.h		\
 	null.c			\
 	number.c		\
-	string.c		\
-	roken_rename.h
-
-if do_roken_rename
-nodist_libheimbase_la_SOURCES = snprintf.c
-endif
-
-snprintf.c:
-	$(LN_S) $(top_srcdir)/lib/roken/snprintf.c .
+	string.c
 
 test_base_LDADD = $(LIB_heimbase)
diff --git a/base/NTMakefile b/base/NTMakefile
index 88425034b..0668cd699 100644
--- a/base/NTMakefile
+++ b/base/NTMakefile
@@ -35,15 +35,6 @@ RELDIR=base
 
 INCFILES=$(INCDIR)\heimbase.h
 
-{}.c{$(OBJ)}.obj::
-	$(C2OBJ_P) -I$(SRC)\$(RELDIR) -DROKEN_RENAME
-
-{$(OBJ)}.c{$(OBJ)}.obj::
-	$(C2OBJ_P) -I$(SRC)\$(RELDIR) -DROKEN_RENAME
-
-$(OBJ)\snprintf.obj: $(SRCDIR)\..\lib\roken\snprintf.c
-	$(C2OBJ) -I$(SRC)\$(RELDIR) -DROKEN_RENAME
-
 libheimbase_OBJS =		\
 	$(OBJ)\array.obj	\
 	$(OBJ)\bool.obj		\
@@ -51,7 +42,6 @@ libheimbase_OBJS =		\
 	$(OBJ)\heimbase.obj	\
 	$(OBJ)\null.obj		\
 	$(OBJ)\number.obj	\
-	$(OBJ)\snprintf.obj	\
 	$(OBJ)\string.obj
 
 $(LIBHEIMBASE): $(libheimbase_OBJS)
diff --git a/base/baselocl.h b/base/baselocl.h
index 3781ed886..5f157264c 100644
--- a/base/baselocl.h
+++ b/base/baselocl.h
@@ -41,8 +41,6 @@
 #include <errno.h>
 #include <limits.h>
 
-#include <roken.h>
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/base/heimbase.c b/base/heimbase.c
index b51190373..1f220baea 100644
--- a/base/heimbase.c
+++ b/base/heimbase.c
@@ -370,13 +370,10 @@ heim_abort(const char *fmt, ...)
 void
 heim_abortv(const char *fmt, va_list ap)
 {
-    char *str = NULL;
-    int ret;
+    static char str[1024];
     
-    ret = vasprintf(&str, fmt, ap);
-    if (ret > 0 && str) {
-	syslog(LOG_ERR, "heim_abort: %s", str);
-    }
+    vsnprintf(str, sizeof(str), fmt, ap);
+    syslog(LOG_ERR, "heim_abort: %s", str);
     abort();
 }