1 files changed, 10 insertions, 0 deletions
diff --git a/Swiften/Config/swiften-config.cpp b/Swiften/Config/swiften-config.cpp
index b3875cb..b616711 100644
--- a/Swiften/Config/swiften-config.cpp
+++ b/Swiften/Config/swiften-config.cpp
@@ -15,6 +15,7 @@
 
 #include <Swiften/Base/Platform.h>
 #include <Swiften/Base/Paths.h>
+#include <Swiften/Version.h>
 
 #include "swiften-config.h"
 
@@ -34,6 +35,7 @@ int main(int argc, char* argv[]) {
 	boost::program_options::options_description desc;
 	desc.add_options()
 		("help", "Show this help message")
+		("version", "Show version information")
 		("libs", "List the library flags")
 		("cflags", "List the compiler & preprocessor flags")
 	;
@@ -55,9 +57,17 @@ int main(int argc, char* argv[]) {
 	}
 
 	if (vm.count("help") > 0) {
+		std::cout << "swiften-config outputs the Swiften build options." << std::endl;
+		std::cout << std::endl;
+		std::cout << "Usage: swiften-config [OPTIONS]..." << std::endl;
+		std::cout << std::endl;
 		std::cout << desc << "\n";
 		return 0;
 	}
+	if (vm.count("version") > 0) {
+		std::cout << "swiften-config " << SWIFTEN_VERSION_STRING << std::endl;
+		return 0;
+	}
 
 	// Read in all variables
 	std::vector<std::string> libs;