diff --git a/src/org/galexander/sshd/SimpleSSHDService.java b/src/org/galexander/sshd/SimpleSSHDService.java
index 9aacf10..2b600d4 100644
--- a/src/org/galexander/sshd/SimpleSSHDService.java
+++ b/src/org/galexander/sshd/SimpleSSHDService.java
@@ -26,10 +26,21 @@ public class SimpleSSHDService extends Service {
 			return START_NOT_STICKY;
 		}
 	}
+
 	public IBinder onBind(Intent intent) {
 		return null;
 	}
 
+		/* unfortunately, android doesn't reliably call this when, i.e.,
+		 * the package is upgraded... so it's really pretty useless */
+	public void onDestroy() {
+		if (is_started()) {
+			stop_sshd();
+		}
+		stopSelf();
+		super.onDestroy();
+	}
+
 	public static boolean is_started() {
 		return (sshd_pid != 0);
 	}