diff --git a/.gitattributes b/.gitattributes
index 0508865..823697c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
-.gitattributes export-ignore  
+.gitattributes export-ignore
 .gitignore export-ignore
+composer.json export-ignore
+composer.lock export-ignore
+phpcs.xml export-ignore
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..5fef36e
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<ruleset name="WPStrava">
+
+	<!-- Include the whole WordPress-Extra standard -->
+	<rule ref="WordPress-Extra">
+		<!-- Exlude these class naming conventions - we're using a PSR autoload standard -->
+		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
+		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
+	</rule>
+</ruleset>
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 8ce32c8..fbe7366 100755
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,12 @@ If your API key works with other Google Maps plugins but not WP Strava, you may
 
 == Changelog ==
 
+= 1.5.0 =
+
+Added composer with PSR-0 autoloader (will switch to PSR-4 once WP's PHP 5.2 requirement goes away).
+Moved files into appropriate place to support autoloader.
+Added WordPress-Extra coding standards rule definition to project
+
 = 1.4.3 =
 
 Fix WPStrava_Activity class not found error.