diff --git a/virtual_feature.pl b/virtual_feature.pl
index 037545e..5a34b51 100644
--- a/virtual_feature.pl
+++ b/virtual_feature.pl
@@ -45,15 +45,25 @@ sub feature_hlink
 # Checks if Nginx is actually installed, returns an error if not
 sub feature_check
 {
+# Is nginx installed?
 if (!-r $config{'nginx_config'}) {
 	return &text('feat_econfig', "<tt>$config{'nginx_config'}</tt>");
 	}
 elsif (!&has_command($config{'nginx_cmd'})) {
 	return &text('feat_ecmd', "<tt>$config{'nginx_cmd'}</tt>");
 	}
+
+# Show fcgiwrap status
+if (&feature_web_supports_cgi()) {
+	&$virtual_server::second_print(
+		$virtual_server::text{'check_fcgiwrapok'});
+	}
 else {
-	return undef;
+	&$virtual_server::second_print(
+		$virtual_server::text{'check_nocgiscript'});
 	}
+
+return undef;
 }
 
 # feature_depends(&domain)