diff --git a/Client/ydotool.c b/Client/ydotool.c
index 6665a80..7c1992b 100644
--- a/Client/ydotool.c
+++ b/Client/ydotool.c
@@ -38,14 +38,9 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <getopt.h>
 
 #include <string.h>
 
-#ifndef VERSION
-#define VERSION "unknown"
-#endif
-
 struct tool_def {
 	char name[16];
 	void *ptr;
@@ -86,10 +81,7 @@ static const struct tool_def tool_list[] = {
 };
 
 static void show_help() {
-	puts("Usage: ydotool [OPTION] <cmd> <args>\n"
-		"Options:\n"
-		"  -h, --help                 Display this help and exit\n"
-		"  -V, --version              Show version information\n"
+	puts("Usage: ydotool <cmd> <args>\n"
 	     "Available commands:");
 
 	int tool_count = sizeof(tool_list) / sizeof(struct tool_def);
@@ -101,11 +93,6 @@ static void show_help() {
 	puts("Use environment variable YDOTOOL_SOCKET to specify daemon socket.");
 }
 
-static void show_version() {
-	puts("ydotool version(or hash): ");
-	puts(VERSION);
-}
-
 void uinput_emit(uint16_t type, uint16_t code, int32_t val, bool syn_report) {
 	struct input_event ie = {
 		.type = type,
@@ -125,29 +112,9 @@ void uinput_emit(uint16_t type, uint16_t code, int32_t val, bool syn_report) {
 }
 
 int main(int argc, char **argv) {
-
-	static struct option long_options[] = {
-		{"help", no_argument, 0, 'h'},
-		{"version", no_argument, 0, 'V'},
-	};
-
-	int opt = getopt_long(argc, argv, "hV", long_options, NULL);
-	if (opt != -1)
-	{
-		switch (opt) {
-			case 'h':
-				show_help();
-				exit(0);
-
-			case 'V':
-				show_version();
-				exit(0);
-
-			default:
-				puts("Not a valid option\n");
-				show_help();
-				exit(1);
-		}
+	if (argc < 2 || strncmp(argv[1], "-h", 2) == 0 || strncmp(argv[1], "--h", 3) == 0 || strcmp(argv[1], "help") == 0) {
+		show_help();
+		return 0;
 	}
 
 	int (*tool_main)(int argc, char **argv) = NULL;
@@ -162,7 +129,7 @@ int main(int argc, char **argv) {
 
 	if (!tool_main) {
 		printf("ydotool: Unknown command: %s\n"
-		       "Run 'ydotool --help' if you want a command list\n", argv[1]);
+		       "Run 'ydotool help' if you want a command list\n", argv[1]);
 		return 1;
 	}
 
diff --git a/Daemon/ydotoold.c b/Daemon/ydotoold.c
index ff2d05b..de09904 100644
--- a/Daemon/ydotoold.c
+++ b/Daemon/ydotoold.c
@@ -92,7 +92,6 @@ static void show_help() {
 }
 
 static void show_version() {
-	puts("ydotoold version(or hash): ");
 	puts(VERSION);
 }