diff --git a/lib/cli/featureutility.cpp b/lib/cli/featureutility.cpp
index d9f8ce437..83786fd76 100644
--- a/lib/cli/featureutility.cpp
+++ b/lib/cli/featureutility.cpp
@@ -244,6 +244,31 @@ bool FeatureUtility::GetFeatures(std::vector<String>& features, bool get_disable
 	return true;
 }
 
+bool FeatureUtility::CheckFeatureEnabled(const String& feature)
+{
+	return CheckFeatureInternal(feature, false);
+}
+
+bool FeatureUtility::CheckFeatureDisabled(const String& feature)
+{
+	return CheckFeatureInternal(feature, true);
+}
+
+bool FeatureUtility::CheckFeatureInternal(const String& feature, bool check_disabled)
+{
+	std::vector<String> features;
+
+	if (!FeatureUtility::GetFeatures(features, check_disabled))
+		return false;
+
+	BOOST_FOREACH(const String& check_feature, features) {
+		if (check_feature == feature)
+			return true;
+	}
+
+	return false;
+}
+
 void FeatureUtility::CollectFeatures(const String& feature_file, std::vector<String>& features)
 {
 	String feature = Utility::BaseName(feature_file);
diff --git a/lib/cli/featureutility.hpp b/lib/cli/featureutility.hpp
index 2a9f7763d..d881d8807 100644
--- a/lib/cli/featureutility.hpp
+++ b/lib/cli/featureutility.hpp
@@ -45,10 +45,13 @@ public:
 	static int ListFeatures(std::ostream& os = std::cout);
 
 	static bool GetFeatures(std::vector<String>& features, bool enable);
+	static bool CheckFeatureEnabled(const String& feature);
+	static bool CheckFeatureDisabled(const String& feature);
 
 private:
 	FeatureUtility(void);
 	static void CollectFeatures(const String& feature_file, std::vector<String>& features);
+	static bool CheckFeatureInternal(const String& feature, bool check_disabled);
 };
 
 }