diff --git a/foreign-status-set.scm b/foreign-status-set.scm
index 108d06a..0233992 100644
--- a/foreign-status-set.scm
+++ b/foreign-status-set.scm
@@ -1,35 +1,59 @@
 (id errno)
 (description "C/POSIX/Unix errno values")
+(sample-name "EINTR")
+(sample-code "4")
 
 (id ftp)
 (description "File Transfer Protocol reply codes")
+(sample-name "")
+(sample-code "553")
 
 (id http)
 (description "Hypertext Transfer Protocol status codes")
+(sample-name "")
+(sample-code "404")
 
 (id libarchive)
 (description "The libarchive archiving and compression library")
+(sample-name "ARCHIVE_FAILED")
+(sample-code "-25")
 
 (id libsodium)
 (description "The libsodium cryptography library")
+(sample-name "")
+(sample-code "")
 
 (id mysql)
 (description "MySQL and MariaDB database errors")
+(sample-name "CR_CONN_HOST_ERROR")
+(sample-code "2003")
 
 (id gethostby)
 (description "gethostbyname() and gethostbyaddr() return values")
+(sample-name "HOST_NOT_FOUND")
+(sample-code "1")
 
 (id netdb)
 (description "POSIX/Unix netdb.h EAI error values")
+(sample-name "EAI_AGAIN")
+(sample-code "2")
 
 (id postgresql)
 (description "PostgreSQL errors")
+(sample-name "protocol_violation")
+(sample-code "08P01")
 
 (id sqlite)
 (description "SQLite database result codes")
+(sample-name "SQLITE_LOCKED")
+(sample-code "6")
 
 (id windows)
 (description "Microsoft Windows API (aka win32)")
+(sample-name "ERROR_WOW_ASSERTION")
+(sample-code "670")
 
 (id winsock)
 (description "Microsoft Windows Sockets API")
+(sample-name "WSAENOTCONN")
+(sample-code "10057")
diff --git a/generate.scm b/generate.scm
index 83f7afd..e9e765d 100644
--- a/generate.scm
+++ b/generate.scm
@@ -214,8 +214,11 @@
    "foreign-status-set"
    '(p)
    (tabulate
-    '("ID" "Description")
-    (map the-usual
+    '("ID" "Description" "Sample name" "Sample code")
+    (map (lambda (entry)
+           (append (the-usual entry)
+                   `((code ,(assoc1 'sample-name entry))
+                     (code ,(assoc1 'sample-code entry)))))
          (sort-by-id (group-file 'id "foreign-status-set.scm"))))))
 
 (define (foreign-status-property)