diff --git a/.gitmodules b/.gitmodules
index 87cf88dfe..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "src/sunwait-src"]
-	path = src/sunwait-src
-	url = https://github.com/risacher/sunwait
diff --git a/html/documentation/changeLog.html b/html/documentation/changeLog.html
index b7abe9ac8..3131ee1d9 100644
--- a/html/documentation/changeLog.html
+++ b/html/documentation/changeLog.html
@@ -77,6 +77,8 @@ <h4>Bug Fixes</h4>
 		<span class="fileName">image-YYYYMMDDHHMMSS.jpg</span>.
 	<li>The <code>scp</code> upload protocol now uses the
 		<span class="shSetting">REMOTE_USER</span> setting.
+	<li>The <code>sunwait</code> command is no longer included with Allsky.
+		It was created but never used so was simply taking disk space.
 </ul>
 
 <hr class="separator"><!-- =========================================== -->
diff --git a/src/Makefile b/src/Makefile
index db41539a4..e8406db0f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -79,7 +79,7 @@ endif
 
 CFLAGS += $(DEFS) $(ZWOSDK)
 
-all:check_deps capture_ZWO capture_RPi startrails keogram sunwait
+all:check_deps capture_ZWO capture_RPi startrails keogram
 .PHONY : all
 
 ifneq ($(shell id -u), 0)
@@ -104,20 +104,6 @@ ifeq (,$(OPENCV))
 endif
 .PHONY : check_deps
 
-patchsunwait:
-	@echo `date +%F\ %R:%S` Initializing sunwait submodule...
-	@git submodule init
-	@git submodule update
-	@echo `date +%F\ %R:%s` Patching sunwait compile warnings...
-	@patch -p1 -d sunwait-src/ < sunwait.patch
-	@touch patchsunwait
-
-sunwait: patchsunwait
-	@echo `date +%F\ %R:%S` Building sunwait...
-	@$(MAKE) -C sunwait-src
-	@cp sunwait-src/sunwait .
-	@echo `date +%F\ %R:%S` Done.
-
 allsky_common.o: allsky_common.cpp include/allsky_common.h
 	@echo Building $@ ...
 	@$(CC) -c  allsky_common.cpp -o $@ $(CFLAGS) $(OPENCV)
@@ -183,7 +169,6 @@ install:
 	  install -o $(SUDO_USER) -g $(SUDO_USER) keogram ../bin/; \
 	  install -o $(SUDO_USER) -g $(SUDO_USER) startrails ../bin/; \
 	fi
-	@install sunwait $(DESTDIR)$(bindir)
 
 uninstall:
 	@echo `date +%F\ %R:%S` Removing binaries...
@@ -192,7 +177,6 @@ uninstall:
 	  rm -f $(DESTDIR)$(bindir)/capture_RPi; \
 	  rm -f $(DESTDIR)$(bindir)/keogram; \
 	  rm -f $(DESTDIR)$(bindir)/startrails; \
-	  rm -f $(DESTDIR)$(bindir)/sunwait; \
 	else \
 	  rm -f ../bin/capture_ZWO; \
 	  rm -f ../bin/capture_RPi; \
@@ -204,7 +188,7 @@ endif # sudo / root check
 .PHONY : install uninstall
 
 clean:
-	rm -f capture_ZWO capture_RPi startrails keogram sunwait *.o *.a
+	rm -f capture_ZWO capture_RPi startrails keogram *.o *.a
 .PHONY : clean
 
 endif # Correct directory structure check
diff --git a/src/sunwait-src b/src/sunwait-src
deleted file mode 160000
index 102cb417e..000000000
--- a/src/sunwait-src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 102cb417ecbb7a3757ba9ee4b94d6db3225124c4
diff --git a/src/sunwait.patch b/src/sunwait.patch
deleted file mode 100644
index b983bff3f..000000000
--- a/src/sunwait.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/sunriset.cpp b/sunriset.cpp
-index ed6ee0b..f7f7974 100755
---- a/sunriset.cpp
-+++ b/sunriset.cpp
-@@ -148,7 +148,7 @@ void sunpos (const double d, double *lon, double *r)
- void sun_RA_dec (const double d, double *RA, double *dec, double *r)
- {
-   double lon, obl_ecl;
--  double xs, ys, zs;
-+  double xs, ys;
-   double xe, ye, ze;
-   
-   /* Compute Sun's ecliptical coordinates */
-@@ -157,7 +157,6 @@ void sun_RA_dec (const double d, double *RA, double *dec, double *r)
-   /* Compute ecliptic rectangular coordinates */
-   xs = *r * cosd(lon);
-   ys = *r * sind(lon);
--  zs = 0; /* because the Sun is always in the ecliptic plane! */
- 
-   /* Compute obliquity of ecliptic (inclination of Earth's axis) */
-   obl_ecl = 23.4393 - 3.563E-7 * d;
-diff --git a/sunwait.cpp b/sunwait.cpp
-index 7e43bc9..8ff6429 100755
---- a/sunwait.cpp
-+++ b/sunwait.cpp
-@@ -662,7 +662,7 @@ int main (int argc, char *argv[])
-     if (pRun->debug == ONOFF_ON) printf ("Debug: argv[%d]: >%s<\n", i, arg);
- 
-     // Strip any hyphen from arguments, but not negative signs of numbers
--    if (arg[0] == '-' && arg[1] != '\0' && !isdigit(arg[1])) *arg++;
-+    if (arg[0] == '-' && arg[1] != '\0' && !isdigit(arg[1])) memmove(arg, arg + 1, sizeof arg - 1);
- 
-     // Normal help or version info
-          if   (!strcmp (arg, "v")             ||