diff --git a/ChangeLog b/ChangeLog
index 99d1f9bd..f21ac4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-11  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/pwunconv.c: Only check USE_TCB if configured WITH_TCB.
+
 2010-03-10  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/userdel.c: Re-indent.
diff --git a/src/pwunconv.c b/src/pwunconv.c
index f49a9f7a..82876718 100644
--- a/src/pwunconv.c
+++ b/src/pwunconv.c
@@ -93,10 +93,12 @@ int main (int argc, char **argv)
 
 	OPENLOG ("pwunconv");
 
+#ifdef WITH_TCB
 	if (getdef_bool("USE_TCB")) {
 		fprintf(stderr, _("%s: can't work with tcb enabled\n"), Prog);
 		exit(1);
 	}
+#endif				/* WITH_TCB */
 
 	if (!spw_file_present ()) {
 		/* shadow not installed, do nothing */