diff --git a/lib/chibi/system.module b/lib/chibi/system.module
index adc26ddc..8b9f94eb 100644
--- a/lib/chibi/system.module
+++ b/lib/chibi/system.module
@@ -1,6 +1,6 @@
 
 (define-module (chibi system)
-  (export user-information user-name user-password
+  (export user-information user? user-name user-password
           user-id user-group-id user-gecos user-home user-shell
           current-user-id current-group-id
           current-effective-user-id current-effective-group-id
@@ -10,6 +10,4 @@
           set-root-directory!)
   (import-immutable (scheme))
   (include-shared "system")
-  ;;(include "system.scm")
-  )
-
+  (include "system.scm"))
diff --git a/lib/chibi/system.stub b/lib/chibi/system.stub
index 7d4a836f..00c372e1 100644
--- a/lib/chibi/system.stub
+++ b/lib/chibi/system.stub
@@ -28,7 +28,10 @@
 
 (define-c errno (set-root-directory! "chroot") (string))
 
-;; (define-c errno getpwuid_r
-;;   (uid_t (result passwd) (result (array char arg3))
-;;          (value 256 int) (result pointer passwd)))
+(define-c errno getpwuid_r
+  (uid_t (result passwd) (result (array char arg3))
+         (value 1024 int) (result pointer passwd)))
 
+(define-c errno getpwnam_r
+  (string (result passwd) (result (array char arg3))
+          (value 1024 int) (result pointer passwd)))