diff --git a/src/util/getopt.c b/src/util/getopt.c
new file mode 100644
index 0000000..dedee4c
--- /dev/null
+++ b/src/util/getopt.c
@@ -0,0 +1,59 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+#include "uhub.h"
+
+#ifdef NEED_GETOPT
+
+char *optarg = NULL;
+int optind = 1;
+
+/*
+ * This is a very simple subset of the real getopt().
+ */
+int getopt(int argc, char* const argv[], const char *optstring)
+{
+ int ret;
+ char* pos;
+ char* arg = argv[optind++];
+ optarg = NULL;
+
+ if (optind > argc)
+ return -1;
+
+ if (*arg != '-')
+ return -1;
+
+ arg++;
+ if (*arg == '-')
+ arg++;
+
+ ret = *arg;
+
+ pos = strchr(optstring, ret);
+ if (!pos)
+ return ret;
+
+ if (*(pos+1) == ':')
+ optarg = argv[optind++];
+
+ return ret;
+}
+
+#endif
\ No newline at end of file
diff --git a/src/util/getopt.h b/src/util/getopt.h
new file mode 100644
index 0000000..21c9304
--- /dev/null
+++ b/src/util/getopt.h
@@ -0,0 +1,29 @@
+/*
+ * uhub - A tiny ADC p2p connection hub
+ * Copyright (C) 2007-2011, Jan Vidar Krey
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+#include "uhub.h"
+
+#ifdef NEED_GETOPT
+
+extern char* optarg;
+extern int optind;
+
+extern int getopt(int argc, char* const argv[], const char *optstring);
+
+#endif
\ No newline at end of file