diff --git a/ChangeLog b/ChangeLog
index b5d8ec52..131c8c30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-10  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/pwconv.c: Only check USE_TCB if configured WITH_TCB.
+
 2010-03-10  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* libmisc/copydir.c: Added parenthesis.
diff --git a/src/pwconv.c b/src/pwconv.c
index b59777bd..07a7d719 100644
--- a/src/pwconv.c
+++ b/src/pwconv.c
@@ -133,10 +133,12 @@ int main (int argc, char **argv)
 
 	OPENLOG ("pwconv");
 
+#ifdef WITH_TCB
 	if (getdef_bool("USE_TCB")) {
 		fprintf(stderr, _("%s: can't work with tcb enabled\n"), Prog);
 		fail_exit(E_FAILURE);
 	}
+#endif				/* WITH_TCB */
 
 	if (pw_lock () == 0) {
 		fprintf (stderr,