diff --git a/transfersh-server/handlers.go b/transfersh-server/handlers.go
index 6560989..a45a42d 100644
--- a/transfersh-server/handlers.go
+++ b/transfersh-server/handlers.go
@@ -180,7 +180,7 @@ func notFoundHandler(w http.ResponseWriter, r *http.Request) {
 func postHandler(w http.ResponseWriter, r *http.Request) {
 	if err := r.ParseMultipartForm(_24K); nil != err {
 		log.Printf("%s", err.Error())
-		http.Error(w, "Error occured copying to output stream", 500)
+		http.Error(w, "Error occurred copying to output stream", 500)
 		return
 	}
 
@@ -573,7 +573,7 @@ func getHandler(w http.ResponseWriter, r *http.Request) {
 
 	if _, err = io.Copy(w, reader); err != nil {
 		log.Printf("%s", err.Error())
-		http.Error(w, "Error occured copying to output stream", 500)
+		http.Error(w, "Error occurred copying to output stream", 500)
 		return
 	}
 }
diff --git a/transfersh-web/scripts/showdown.js b/transfersh-web/scripts/showdown.js
index ad5d59b..323c9e7 100644
--- a/transfersh-web/scripts/showdown.js
+++ b/transfersh-web/scripts/showdown.js
@@ -106,7 +106,7 @@ this.makeHtml = function(text) {
 
 	// attacklab: Replace ~ with ~T
 	// This lets us use tilde as an escape char to avoid md5 hashes
-	// The choice of character is arbitray; anything that isn't
+	// The choice of character is arbitrary; anything that isn't
     // magic in Markdown will work.
 	text = text.replace(/~/g,"~T");