diff --git a/CHANGELOG b/CHANGELOG
index adace7f19..55f1773fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -48,7 +48,7 @@ v1.2: 2013-12-05
     * Add debug output to ownCloud log
     * Remove PHP warnings from ownCloud log
     * Check for duplicate email addresses
-    * Fix SQLite incompatability
+    * Fix SQLite incompatibility
     * Updated translations
 
 v1.1.1: 2013-11-17
diff --git a/lib/outputdata.php b/lib/outputdata.php
index 7a2a8ff64..f944aea75 100644
--- a/lib/outputdata.php
+++ b/lib/outputdata.php
@@ -18,7 +18,7 @@
 *  - '0'
 *  - '1'
 *  - 'success'
-*  Or can be used to write json formated output. In this case argument of function write should be an array.
+*  Or can be used to write json formatted output. In this case argument of function write should be an array.
 *
 */
 class OutputData
diff --git a/lib/urlparser.php b/lib/urlparser.php
index 031793b0b..f6e58c2d3 100644
--- a/lib/urlparser.php
+++ b/lib/urlparser.php
@@ -27,7 +27,7 @@ class UrlParser {
 	*/
 	public function __construct($url) {
 
-		// Parser is valid at the begining
+		// Parser is valid at the beginning
 		$this->parseValidFlag = true;
 
 		// Parse URL