diff --git a/Capfile b/Capfile
index 306a9d64b4d13679a3e274e38b23d7d616826fcb..2fa68b66d899b9b4b22d2fc024af728357e861e1 100644
--- a/Capfile
+++ b/Capfile
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
diff --git a/README.md b/README.md
index bac9cd40fcca0c05476a3a5f7a111ee9adfcfcf9..fc4b5aedf9dad475ccad0b451531f5d08037d8e7 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ We are continuing to build features and improve the code base.
 When we think it is ready for general use, we will post more final
 instructions.
 
-## Commit Guidlines
+## Commit Guidelines
 
 You are welcome to contribute, add to and extend Diaspora however you see fit.  We
 will do our best to incorporate everything that meets our guidelines.
diff --git a/Rakefile b/Rakefile
index fa9be254a924b609d6ece3081039651634812374..c5f2232934c5a8d12b8a760384cea25798ea50e3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Add your own tasks in files placed in lib/tasks ending in .rake,
diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
index 9e48598302c26a42768fe5a7c0e9940df22dfb9c..5cfbe4c8533d2de72d3c24025ecf0b37e760932c 100644
--- a/app/controllers/albums_controller.rb
+++ b/app/controllers/albums_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class AlbumsController < ApplicationController
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 52975730ba5c0e2ec1600d492be6d33ab4d4b942..09f82d38e3c2e15fb35b1bf0d80d13a768fd12e2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class ApplicationController < ActionController::Base
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 81056ef10a1477cad00833e66270d3c7eb2d1d4a..34b722aeeb26bb312ac04958b8c5f2d5ce533663 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class AspectsController < ApplicationController
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d1efc3e109c068970d1edbdfa0ff23b320fddd7b..8d5ce80fc8037a0c10dd3ab415ffa14ea0608a46 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class CommentsController < ApplicationController
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index bd9a849ab7fc5a41f3d7b387de7e5578480d0359..a556547b0069bc37a309372177f8d56c0f91d9e6 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class DevUtilitiesController < ApplicationController
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index be1f899910abf3ebb3027a9f238bc0e5402b9016..6ada5bfe19534002be516791638432222171a28f 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class PeopleController < ApplicationController
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index dca510374151a5fa41f003e486464736e8f5bf9d..a1ef260b1184080241378ad039e1981882244b26 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class PhotosController < ApplicationController
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index f57b945404dfa6d8f4ad2e616d6bfd71ec33fc24..d2348a0d987ac1ceb04b95a83a7dce529fa71c69 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class PublicsController < ApplicationController
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index b630c6617d240c7617067e096aac664c32681cf2..b29887112d2f5dde61e371a909b6495abba64adb 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class RegistrationsController < Devise::RegistrationsController
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 31c6e6efd565e6bc2ea6d0ed06868276bbe3242c..79a29461ecabd492b3ef3b52b6d21ffe1dbf2069 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class RequestsController < ApplicationController
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index 82a58c5087a12845c546f0bb71001352c4a4e0ef..97f52cef2a532ae89bbad98c94e5ef3156062004 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 
diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index 88d8e6b409c7374832f4569d9ad63fa99d4c03ef..95f327fed5f907888eb5984a4f4c43f5a8940067 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class SocketsController < ApplicationController
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 137dd8a7eb5f302350f8fb3dc1d01fe5b5dadb40..f447e96b5a2cfe2bb8a7b4fcee7f6ea42adb52d6 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class StatusMessagesController < ApplicationController
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ac22a32b7d10c5e0159d7bc66f2064c91a4e9e5a..407b85330cd534412043939258b4a866ef63c7f9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class UsersController < ApplicationController
diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb
index 6d85c747c27c70aa32e48e816e376727540134cf..a5e47b440fe07cee36b686621698101c0842f85d 100644
--- a/app/helpers/albums_helper.rb
+++ b/app/helpers/albums_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module AlbumsHelper
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7745ace968f817c0db6569fc5ae6ca562663a514..54a4555d2ff1ba5ed4a43077ed4396d55dfa109a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module ApplicationHelper
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index 66baffca2b98e36d9a925354c4a3c5e70847f914..265b052a8a61a3e811e4666607d5cb56fa7ec941 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module AspectsHelper
diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb
index e8a9d8f7171339edaacafe0a6f7f58fe772289c0..57d64397ca2312d30502027bee0fe91d6d55ca00 100644
--- a/app/helpers/dashboards_helper.rb
+++ b/app/helpers/dashboards_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module DashboardsHelper
diff --git a/app/helpers/error_messages_helper.rb b/app/helpers/error_messages_helper.rb
index 9a64dca365f1f0281b45c29219e4dad411734d91..6c1e462098ec5e59d6386b0540423327fbb8dfa3 100644
--- a/app/helpers/error_messages_helper.rb
+++ b/app/helpers/error_messages_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module ErrorMessagesHelper
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index e33556c355f052615adb511c515b05213bd43fe5..166e6b25489f101871ff126f72e6a3e6d1522e58 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # These helper methods can be called in your template to set variables to be used in the layout
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index f1fa6487f5278cd1f9acac30d321daf0e7bfe595..05f53def3a79237bbbe99d91b265058c0d2c880c 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module PeopleHelper
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index 1f52daa0cd97fe2b2713103a7833129e2eda17dd..ede57d43e70444198c21b2e10c161c81aff2f2f5 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module PhotosHelper
diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb
index f14fad7a6a04e97627958602fb0c0daffa862abc..7b6a8763b79fe5461d6db6f83b072f59d49c1a7a 100644
--- a/app/helpers/publics_helper.rb
+++ b/app/helpers/publics_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module PublicsHelper
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index 98ccc8f75d6cb3032343ac97b78c6fb4de2a4327..00cf61e5da6d3f5f980f13c2f00bd7932e049ca7 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module RequestsHelper
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 892e15f59bb445658c0da8d14361eb51f73dc1ee..86bef13fa10b2420626171d1cb92f317b4c9d5e2 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module SocketsHelper
diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb
index 08461b6353ebbb92714b4a4c88d2803cf95e6880..2dfbd31cccebfd08c4da3d55f9ba55c480fca28f 100644
--- a/app/helpers/status_messages_helper.rb
+++ b/app/helpers/status_messages_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module StatusMessagesHelper
diff --git a/app/models/album.rb b/app/models/album.rb
index f62cbdb794a9437939597625fe00aeb64541adbd..4f7294ff9d2c3f5f241327cffb682a4861a8d90e 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Album < Post
diff --git a/app/models/aspect.rb b/app/models/aspect.rb
index 10f7aba142de6c7dd0a37092b52563d40407c671..2e6dca694b37961f869817b70100a5162e411129 100644
--- a/app/models/aspect.rb
+++ b/app/models/aspect.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Aspect
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 4bf0dbd5e86e4777ab434b81cb42090cc692443c..540b44f2e4c704372111fd2d364e525a1217db48 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Comment
diff --git a/app/models/fb_status.rb b/app/models/fb_status.rb
index 40d9cb16e8060f9a23b8fb24370798b1340fe8d9..0e7d2692e62384930422d7f1081fabff09f42656 100644
--- a/app/models/fb_status.rb
+++ b/app/models/fb_status.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 
diff --git a/app/models/person.rb b/app/models/person.rb
index 8d1fee5d55af1a5794d803ef764025832d63fcce..76bcd2aa3a1e0c58fe5cc7dca5f2a156ecd791d7 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.expand_path('../../../lib/hcard', __FILE__)
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 15d105739c7963f1cc61d9bbc7b009d959aa8c79..a6e20ba33105498a88e0557e93ee6b1b819c779c 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class PhotoAlbumValidator < ActiveModel::Validator
diff --git a/app/models/post.rb b/app/models/post.rb
index aba8221608d97aba503d1700a861a705330e8de5..ca4a5a2c9e012c575d81716f8d7e28d8a9cee604 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Post
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 2b8303bd18dd6a97672642390c94f65fc989f7e6..3bc9a18acc1dfff918ff82d560597ab711de7d47 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Profile
diff --git a/app/models/request.rb b/app/models/request.rb
index 5ba4769a206b87a4ae6fcaf4520da09c77f2d8e6..6cf3d77ae33c46938cfe0ae4cc4fef312e94360a 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Request
diff --git a/app/models/retraction.rb b/app/models/retraction.rb
index 20f74bf29285eca1916bf0f08e5f669cc5f32bd1..10b055a38f82833fe0dbcb74dcffeb5c3db70943 100644
--- a/app/models/retraction.rb
+++ b/app/models/retraction.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Retraction
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index b509bfe5a9f6ee6cc66210aba8c4d5cc1bb6df57..1c167706efa0832f9c7f7c1f411f2cce3bee2ba2 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class StatusMessage < Post
diff --git a/app/models/user.rb b/app/models/user.rb
index 238397bdcb3b16c255f97372daabd856cfebd350..01094d219aeb2d8ddc1cd007a7696fb5d9e2e05a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 247f5f997451b76b6c20bc8c666c6f91a34bc01e..9beba3ef6312cdecf872fb087dbbd5ba609a8cc3 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class ImageUploader < CarrierWave::Uploader::Base
diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
index 4f41e5cfbf78e7e20e5580697e62545ad2b84e87..f9f7d43e2428cc07af917aaf7c5aff5d5054dd0e 100644
--- a/app/views/albums/_album.html.haml
+++ b/app/views/albums/_album.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 .album{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
index e0212a6b4566c7218960cba9698e549ee8503e20..07431d20cfd2fcc29577330793fb5e7530e644a2 100644
--- a/app/views/albums/_new_album.haml
+++ b/app/views/albums/_new_album.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1=t('.add_a_new_album')
diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
index 67cc3071d6355ae51b772f0922bc30f63a3d5939..0f96bc1cd6afdaf0e4e3450bc6e4ec067ac7eedc 100644
--- a/app/views/albums/edit.html.haml
+++ b/app/views/albums/edit.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 .back= link_to "⇧ #{@album.name}", @album
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 2e680c1102137f34748420281fcd91532e31a8f0..0d68bb1c137780dfa2ce4e8baa97fa6a53871bcb 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :head do
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 4c9ba19b861e1643943cee031ae79ec3db7c357f..6ba593d62e61205e6e5c83d66f2da010b6734a06 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
index 548abd0d1a91ae6f7e084866fe3e51c8548f05e4..8c3c45f4d19e0d2a58d5b2db94b9cf97ca0bbc52 100644
--- a/app/views/aspects/_new_aspect.haml
+++ b/app/views/aspects/_new_aspect.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1=t('.add_a_new_aspect')
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index ae24e8e3b72750d347db1a1aff74b20df681e34e..772a71971aaf4887490a4a98ec99edf46a87a863 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index e08f6dabdbc2de5308f4853a0d36744789d9b133..e818657e8f617d88903245fa3d34c4ea0a9b73ff 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :head do
diff --git a/app/views/aspects/public.html.haml b/app/views/aspects/public.html.haml
index e85cae2762d866c1ee5b4ceb91128f109e80eb7e..381676cf29557f92cf5f4be19c1f5ebc0740b44f 100644
--- a/app/views/aspects/public.html.haml
+++ b/app/views/aspects/public.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 
diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
index ae24e8e3b72750d347db1a1aff74b20df681e34e..772a71971aaf4887490a4a98ec99edf46a87a863 100644
--- a/app/views/aspects/show.html.haml
+++ b/app/views/aspects/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 03a2fcf61fd13fed1463304c753130984b5576ba..3e927f72379d652b43a6aa1f43b4ec6fb57a55c4 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.comment{:id => post.id}
diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
index aecfb4bf17bf8ac64948d4b99980e7115d2d7e3b..7378fc97ee4f6fd02a33c220b40c9d78be3a0030 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %div.comments
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index 99c03f8986ed13d8150f0f5e2ca1a3402820ec58..2c95d4385d5f8116fadef4313f67845235c1fb80 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 = form_for Comment.new, :remote => true do |f|
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 4677f6ce677f67b42529f413b367617022f2e3c2..a0663edfc593e8e69fadc422b5f78d49fcfb8c6e 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index fc063e0b6acf3c9f5a229fdb69d9e9a0b27b203c..99dec9e35fdd128c93ee43c4466d49e687e95cfa 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 !!!
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index 29b863b32de2bd9027d3092211a41c4e6f84af3f..bc15063d627a4b65061267b450a9d2f95b6683cf 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 !!!
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index 7e22a5570b274f5534d48ed2d5b2543db2b45067..3e20a658ae6657801d606edd749420ac393f0189 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.message{:id => person.id}
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index 5981569b82fa577f7fa739da78d8b6d7e26c2399..4ad7a93af1e087f38f872f15a5dcaa61f0d30a00 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :publish do
diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
index 0584732bc0776a5aae297d6db44602111bdce093..7685a8933c3f554ed7204054b7d7abc173abe27b 100644
--- a/app/views/people/new.html.haml
+++ b/app/views/people/new.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - title=t('.new_person')
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 9b5128160e678078e31015389bc60a808f80b5b4..3e1fc31e63e9e44d4b7a48123e03c84660f1b3ce 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index d1a4fc73f576560c7977181884024da1d60dfc60..6ba1327e8e71238d4bf8ec254a08f606917ff4da 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index 5e86e32a6dd02c1564125dba7ee295eb131617ee..71049ac72be69b1306d9b323d67ec301a193115c 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.message{:id => post.id}
diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
index e70030562a16336d31f7227006e2c569d012924f..78186d2481150faa0e15a537c54fe363bfac6fe2 100644
--- a/app/views/photos/edit.html.haml
+++ b/app/views/photos/edit.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1.big_text
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index d8701c265157ac65e65290b868991d483a97b081..bca1d0884749bff99d46e6e1fe153333f69a140c 100644
--- a/app/views/photos/new.html.haml
+++ b/app/views/photos/new.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - title t('.new_photo')
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 53cda49bafd8bd7f6e8380ebebe9ea00acbfb4b9..58c363240f338c52d34a0f4c1379bbc334ceaae8 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
index ef1984d7d7e7a296548112804198d193452d550e..39bc2a5d52f55b5209751987c4e8e5d6ef107925 100644
--- a/app/views/posts/_debug.haml
+++ b/app/views/posts/_debug.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 #debug_info
diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml
index acad2e12be4789fddfc83f5239f3c4b1635f213f..5c306fa3633779ac61832d6b7f17755cbfd91954 100644
--- a/app/views/posts/_post.html.haml
+++ b/app/views/posts/_post.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %ul
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 0dbf5b0a129189a6f6f735fc58941d611419f1b0..ced50fd5456f3c3d9642f5d516a2840641ba3cd8 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index 8c22700aad139e6d4a68221429534d05ea569e38..03da4ee9bff28cca0706172381a2d181e1e10831 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 #friend_pictures
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index dc01afd20aeeac4df5a967f28108b6cf5d769ff8..8d1fa844da53e396f6c23c36f35ff27b0f802c6f 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 #aspect_nav
diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml
index 956706b683c7a650d94ff81a4436bf7bbd20ef0b..538d90348ae923696259fa9f6fcb0cc72eb04772 100644
--- a/app/views/shared/_post_wrapper.haml
+++ b/app/views/shared/_post_wrapper.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index d1ad995df0dacbd1732d4b5aad121007385090cf..410670c85596582de166c5a7915e614b8ceaaca8 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 #publisher
diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
index 9df1c9ce19d6f1fda94df07a630edcab5b1ab224..bf785e4fa73acc9224f5ca5a1430fa9535ba9f6a 100644
--- a/app/views/shared/_reshare.haml
+++ b/app/views/shared/_reshare.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/app/views/shared/log.haml b/app/views/shared/log.haml
index bf957bf7ce2dfc64e26d6458d4e46cb11d62cc69..707507ff8d1e2de73986850d6e26f66a5409d8b5 100644
--- a/app/views/shared/log.haml
+++ b/app/views/shared/log.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 = @log.to_s
diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml
index c27585f0a572dfe2c3e58efbef5952b9e89d2d62..00db8eefe1b85d0abe9839ad3bbcb5d34f4090ce 100644
--- a/app/views/status_messages/_new_status_message.haml
+++ b/app/views/status_messages/_new_status_message.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 = form_for StatusMessage.new, :remote => true do |f|
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index d1568c7bbff8d6b5eadfe967e714ab9d689f1e91..d8c56ff2fc1754658098b9fd3ab01dcc78f1a713 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
index 43c065380a86ee32ef62d10d8c540cc94e58346c..9bbd93abfce479a4cab1352bd03d36c6e9c7a11c 100644
--- a/app/views/status_messages/index.html.haml
+++ b/app/views/status_messages/index.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1.big_text status messages
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 3d78dd29edffd9a7b0e6d818079f01a1520b636e..4521bae5af888539760f216501cedd17b440fbe2 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1
diff --git a/app/views/users/_profile.haml b/app/views/users/_profile.haml
index cef161127db45f98b5b880b0e8646344789bc4b4..7f935972bf90ef8c24cf9ac1becc281630a042e4 100644
--- a/app/views/users/_profile.haml
+++ b/app/views/users/_profile.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 
diff --git a/app/views/users/_services.haml b/app/views/users/_services.haml
index 648fbe1612b76b1673806bad5b43eee14288da55..07173ecd890022ec1bbfa03b61c84043497fe8b6 100644
--- a/app/views/users/_services.haml
+++ b/app/views/users/_services.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index e3fdca4ff76c7e50d916a9a5c69928b510a9f118..cd8deb068c27c740f71e32246c36ebcdc9875d43 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/autotest/discover.rb b/autotest/discover.rb
index 76b9d2044101321d9997650c53c6a2a4dec7a1c2..a0d0bc50a7a94c3ffd0008e644045b3a105796c6 100644
--- a/autotest/discover.rb
+++ b/autotest/discover.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Autotest.add_discovery { "rails" }
diff --git a/config.ru b/config.ru
index 0c65f5908bfbdbd3f73fc23baf15883a19c8b7f4..70f6cd2c482bebfb35bfa1a0a3b39d46e06739c0 100644
--- a/config.ru
+++ b/config.ru
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file is used by Rack-based servers to start the application.
diff --git a/config/app_config.yml.example b/config/app_config.yml.example
index deb69220eb3216982d79bfd5af52f9d31c6773d9..0bd3771f79c4d55448f9b9b4fe6336863d84ec08 100644
--- a/config/app_config.yml.example
+++ b/config/app_config.yml.example
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 default:
diff --git a/config/application.rb b/config/application.rb
index 59b82e21697ab87e64bc948c76ce9b7662981ffd..6c813a82a2cd26f30371c5d6ec710fdeae018e0c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.expand_path('../boot', __FILE__)
diff --git a/config/boot.rb b/config/boot.rb
index 0d0c42268975555044d179ada47e531923e3e296..02c15be66cf2de87d4e8fa6947cabd801217a85d 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'rubygems'
diff --git a/config/deploy.rb b/config/deploy.rb
index a4f139b9c62d67afe6fb9a33f0ff5ea6e3fbd966..b4893ec93748366e93d7a075af73c88527ec5b70 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 config = YAML.load_file(File.dirname(__FILE__) + '/deploy_config.yml')
diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 55aa00f6ef63c7d5a3c4bccb1dd4a5c902c663f5..06a6747e1f7ad3c61ceaf018bf965066e52d3b26 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 cross_server:
diff --git a/config/environment.rb b/config/environment.rb
index ddfc9c247d7824ad8f070d87924c03cdf0d5e062..bf2896fc685e431f38c36f2a98f1fbb6207312ea 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Load the rails application
diff --git a/config/environments/development.rb b/config/environments/development.rb
index fdd10c25dc09c5e9f5568fd312ecf3bb4d67329d..5c6718ff21afeb19f0f1a1241d86865a16b7f6d2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.expand_path('../../../lib/mongo_mapper/clear_dev_memory', __FILE__)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb13c1d1c1222783cc0c979a14e8164930d85fb8..eebcc420b071318589b1a1bbb2ae4500326b440d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 46b44db551a26d7bc07b570600568bf7d4c8ec1d..0c5f85bdf424858a321c32778373933a2a3dd1ea 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
diff --git a/config/initializers/_load_app_config.rb b/config/initializers/_load_app_config.rb
index 22bf14ead0b29f93c7bef4cd64d668be2061421b..723e385255c3c88f843dad96ceb323aeca42985b 100644
--- a/config/initializers/_load_app_config.rb
+++ b/config/initializers/_load_app_config.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 def load_config_yaml filename
diff --git a/config/initializers/_mongo.rb b/config/initializers/_mongo.rb
index 7d14315a70cd6fb8310a98a200061fbc0766ecbb..41a2098c070eb64d16632eebe049599298d78584 100644
--- a/config/initializers/_mongo.rb
+++ b/config/initializers/_mongo.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ENV['MONGODB_URL'] = ENV['MONGOHQ_URL'] || URI::Generic.build(:scheme => 'mongodb', :host => APP_CONFIG['mongo_host'], :port => APP_CONFIG['mongo_port'], :path => "/diaspora-#{Rails.env}").to_s
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 1efed86e96f62305d888eb35a905082827e36be3..211f52bdefc15660625f514c22265ce43883bfe5 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index ed1d07f91b7a079625f8f2aa390b9da404bd828b..0451db212449de4e06b32de5b2e84e0ca166c22b 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 CarrierWave.configure do |config|
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a02045546ee67aac310969916ed69b91008c459d..620547cd5ec8b96e21c8944f72dfa6f028ccc553 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
diff --git a/config/initializers/git_info.rb b/config/initializers/git_info.rb
index 82fc99143c2db46c72acb66c6bfec6db6f172166..e7aaffdda9f0a0a7755c162aa14caf83adf725a6 100644
--- a/config/initializers/git_info.rb
+++ b/config/initializers/git_info.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 GIT_INFO = `git show --name-only`
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 0e4097c04451821067c4921b1068c191b44c3a36..a4331f61ad62076ad9a21dfb0abbc8bf8e985afe 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index 823179842d6e01d3a177b4949f11feaef56b4820..08d3923b06b135e827fd48967913d221afb2621e 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
diff --git a/config/initializers/logging.rb b/config/initializers/logging.rb
index 48cc2fa303da9316d03df477eb9d4fbf86ae31aa..08b639bf5517b9d91f2ca1c8e9bdf12237fa9591 100644
--- a/config/initializers/logging.rb
+++ b/config/initializers/logging.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Rails.logger = Logger.new(
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 77424db27ac5e336e2674bf66a14f2b91aea983b..1c9cd84251396832cf3ba2d6c308a3b02f02e30d 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/initializers/rspec_generator.rb b/config/initializers/rspec_generator.rb
index bdec44a0329f5f35ddcce37f03b633b277a164a5..0aa078ab955045edc4e194252b6d8d0926e25872 100644
--- a/config/initializers/rspec_generator.rb
+++ b/config/initializers/rspec_generator.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 66c59261abcf768bab8e5450bfd1151a384c3c8b..f7864e187dd6e07a1d9e3e6dde6bc7d71423fe24 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index f4e36ea899d2d79e83e832da5b394081ddf9a9e9..29a6621f36158cf9e85ad21b0afedbafabbc55f4 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index 2b555cb5f8a73de957eeb1b6711f8368e86595ae..9223335213d3995942cffaae9093c2c0688bea72 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ar:
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 26ff8044db7b2e66f8e679029a632dba2a931a89..ec0e298b4fe8c179f74bf8c24ed916237fc1754d 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 cs:
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index d8b6d94f49e75d2e28291272fed0ad3a750ea095..54704978bd97af742adc319742a41abfaff39184 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 cy:
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index e6608c18191dec3c3ebe7269d7041f01c0543350..543ab19350ffb3f7cf13f7e212c1a0b3be057a4f 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 de:
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index 7ab686bd4e9843ff0aecfe8e9106d1d2ebaefafe..06308488bd25cc5ce9c51c9720e5b3a82b39c7e3 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 en:
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index c77ead4b26c2ca963d3b565fe0918f649370eb06..5f122172fd21479cef667e49f7e6064bf839ebee 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #   Translator: jarkko moilanen, jm60697@gmail.com
 
diff --git a/config/locales/devise/devise.fr-informal.yml b/config/locales/devise/devise.fr-informal.yml
index 6fe14382e3ee17de7d2ede8805e9f65eb4d71824..298525ae94f899ca457f37c9dafb3644fbc65677 100644
--- a/config/locales/devise/devise.fr-informal.yml
+++ b/config/locales/devise/devise.fr-informal.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 fr-informal:
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 240e9d967d21b049aae335cf8b4e428df1ff238f..69518e4a6ec2f8bfa27c75dc4f9103635ed2038a 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 fr:
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index 997ab6df00fdf41990d2d98b3480a45246eb562d..806ac3a32e152b8d68df50f85b3f7fe810cd6ea6 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
 
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index 96044d191844cc11511751f2afe6fc3412c06062..bd40e97a79a2657fc30686c4e515240b65f0444a 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 it:
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 8ae8f027b5b3e1aef526d2f648deefdf902eb076..9544bfd37c68bd2735965f4b90d47218f62748b7 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 lt:
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index c7aa1f27d8f18b5d2ef8d725f87e381d7df93cca..fdcff9a945a4fe5995d996e89b673b96715f39b3 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 nb:
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 503fb6d6136a2db73be11e1dbb7de39ff73e005e..89365309514ea146e5fc338793f2385aed07d8bc 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 pl:
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index 5a39a4734550150d5c3006916b70a35b1cb5eeb2..f7251fc6f0be7c35a49ca40d95f7dd123afcf3e1 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 pt-BR:
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index c0c9555171ce189c5c892b730f2eda5b67cbf546..6bb679bfd9aee95d821dc480474c0a43ae77097e 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 pt-PT:
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index b4d12e6b67825509b52e353cd07467d6126b1d9b..a61b4e742430161284bf54bddcb1ed5868d2fab5 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ro:
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 1ac6268618d59582167a5d1f877f7423cd50ab3d..8283e97a1fe8c26f348b512726701ca146a27734 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ru:
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index c83179bde9212605431d24e9b22fa2ee9221b24b..dab52d6091839456135ce24615c2b692ec433f1d 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 sv:
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index cddf877063dd13351e56ea6da52a526830917f1e..87522287abe294cb061311e7abfae03709b31e6c 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Arabic.
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 7b454f8133ecdb10a58bfe6f213fc18aad0a7941..9512645e3512db02fd24a61221fe5a496afc41de 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Lithuanian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index cd1c7dbd650449776f84befd39822a13f619b8a0..49343d2465549e11e1b877ab8ac925467942bc1a 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index e277a5efd4405d1ccf942b2895bccaa0fc4f2803..1f7c028aee71a57acb75eb21252d2f922c6d8d99 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Localization file for German. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 5595c4caa94c5db2e18b33fb5a03b1964a0cab83..5a5cc7a4358be0c1ee4eeb081d3f85c24d99d55e 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 5a73715b98612edc3342642ffac4e8e22d5fc6f6..4e3ea63b4b620e11bc0e0119aa1f50cd92a404a6 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 5e1a6da3272737b4773dcef393e31ba0a5e10151..88e06e580e4cc222d66c31c93a613eedb5999c0c 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #   Translator jarkko moilanen, jm60697@gmail.com
 
diff --git a/config/locales/diaspora/fr-informal.yml b/config/locales/diaspora/fr-informal.yml
index 1c7950fe55e1c6fc851fdcc849ed5f4c17b0e059..8a30d7ad9216c0ec53850f8a5948a171ada7e85d 100644
--- a/config/locales/diaspora/fr-informal.yml
+++ b/config/locales/diaspora/fr-informal.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Localization file for French (Informal Honorifics). Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index bab6f38520bcf236837b8c8eed7af8a552f83763..92abcbcfb00d7f32fb56f989e4788c6e9ab95d5d 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Localization file for French. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 221a7c5f7c0bd5133461f95d8de7fa1cee8be6a7..5bf276163317bec1dec912b27d09a62f1600c7de 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index fe4b305ccd771126108f32e314aa15b4f1ff13d7..4c934420dae4c7b697ec82746838e89c7e6b5e09 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Italian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 01295e3895da41ca95aa628a13ae710a0fb25c89..417ebb37edfc7ada452d7aaf631b15600b2bb7e5 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Lithuanian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 82f927db1c841b2b486dc465458baf40b6cc9d55..79c603471e67ab1decb4eeb7bfcbebc52f6a86cb 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index c55b7969192553973a4e3d10f135515d30c7b413..378b93ced551b4d3a1b64805fa3308985503818f 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index e8ffcc8e1316e1b3cf16bd91260ad8d1200a1ce9..c04a60759e4a9c8ac474b5d00865bc98dd2dbc1c 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Portuguese Brazilian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 6df399150c8ca51f34f26631d80e0a62cac0d087..95c56ca509fd03fb9cb90007dac767aefbb47279 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Portuguese Portugal. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index ed3234571583009a6fcf3faea00406eb996da151..355f6c78895d19c1f03d2c25044b18d5e08de89b 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ro:
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index f432c82d6bd37fa55477851145243ff3f36598ae..dd94acf08939a29278aa06f1ee855198ce4011d5 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Russian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 1aa9ac2dcee2fb6b1843de5a379821be1684831f..b7d89d0195ce811bc13b2f1997289f79d38315f2 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Swedish localization file.
diff --git a/config/routes.rb b/config/routes.rb
index 6f9f529db43e75481b7a9e414fcc2a990441082e..802ebd260dbe5e139030ba5d1d234b1106f3e805 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Diaspora::Application.routes.draw do
diff --git a/config/selenium.yml b/config/selenium.yml
index 0d679b602e13781ade17de32f46d671c231a7f76..5e10d5a02346cd5e682f46ec987f4f0de443089e 100644
--- a/config/selenium.yml
+++ b/config/selenium.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 common: &common
diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf
index 188daedcb3c52a890b6444cc11754e4ef6983789..68eff160678a81603c140b9b1cb2692885762a8d 100644
--- a/config/sprinkle/conf/nginx.conf
+++ b/config/sprinkle/conf/nginx.conf
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 worker_processes 1;
diff --git a/config/sprinkle/packages/database.rb b/config/sprinkle/packages/database.rb
index ef290b424259f8c9f4f4b324c158534c0053f709..fa402b8cef7f7d9c44d81be120b64e1370bbb013 100644
--- a/config/sprinkle/packages/database.rb
+++ b/config/sprinkle/packages/database.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 #package :mongo, :provides => :database do
diff --git a/config/sprinkle/packages/essential.rb b/config/sprinkle/packages/essential.rb
index 8b4349d061ce71ec81932f6d2aca5aee130f3844..f550f4f340bc7c8577f24d01960550b8bac29ac1 100644
--- a/config/sprinkle/packages/essential.rb
+++ b/config/sprinkle/packages/essential.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ## Special package, anything that defines a 'source' package means build-essential should be installed for Ubuntu
diff --git a/config/sprinkle/packages/ruby.rb b/config/sprinkle/packages/ruby.rb
index c29af29cf4183e21747220ea18a4432be2452c40..2c2f5914588cfde215b7a3cdf3af9a89af36eeb3 100644
--- a/config/sprinkle/packages/ruby.rb
+++ b/config/sprinkle/packages/ruby.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ## Defines available packages
diff --git a/config/sprinkle/packages/scm.rb b/config/sprinkle/packages/scm.rb
index 981214a605738bd028b46be6a0316eb06e19e803..67aa2c849a331e24bf736fbccd8c6e2af97da7ae 100644
--- a/config/sprinkle/packages/scm.rb
+++ b/config/sprinkle/packages/scm.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 package :git, :provides => :scm do
diff --git a/config/sprinkle/packages/server.rb b/config/sprinkle/packages/server.rb
index 004883dada463fc7e60f69f2115ff1e5a7cd4b6b..129e7b7f6c5fee8bf7ae71cb6caad00c54127317 100644
--- a/config/sprinkle/packages/server.rb
+++ b/config/sprinkle/packages/server.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 package :nginx, :provides=> :webserver do
diff --git a/config/sprinkle/packages/unfortunately_essential.rb b/config/sprinkle/packages/unfortunately_essential.rb
index 23975f870933c1858188939d542e104c513648b6..f18f1ebb93c0f80790489166d2f3c6a7a4acb2c5 100644
--- a/config/sprinkle/packages/unfortunately_essential.rb
+++ b/config/sprinkle/packages/unfortunately_essential.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 #Fix dreamhost
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index c3a7acae839bd40c4384ffadd370f8e8fe1dbf19..d57ff29c0f23ac540955211cfa2d2d507bbd402b 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -1,6 +1,6 @@
 #
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require '#{File.dirname(__FILE__)}/packages/essential'
diff --git a/config/thin.yml b/config/thin.yml
index a49d85ce4e11db1a3b6bab1bf3727cf60d295345..67f98104aaacb1018b8108b1cdec2f8a69bd6cb4 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 rackup: /usr/local/app/diaspora/current/config.ru
diff --git a/db/schema.rb b/db/schema.rb
index 19e6df260c35eb94eff1dc978dd690e92eb2ae66..a05d3a11c76275592dfca923f0bb4fc497492543 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file is auto-generated from the current state of the database. Instead of editing this file,
diff --git a/db/seeds.rb b/db/seeds.rb
index 687d2622e5a2b7b754ef89b9eda36dbb0f265884..2307e70d88db6873e9bf45eef0220bdfad010d6d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file should contain all the record creation needed to seed the database with its default values.
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index c4805eae82ced46a7e350f6962e8c70302c7fb7e..2305dea93c5ad0af27beab87c831bcf8adaee354 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file should contain all the record creation needed to seed the database with its default values.
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index f10abec4f67d87fecd371dca3e46a4e54d9d0fb0..873c58ec5f2ccf6a48892fec562df98bd523f635 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index 5c418c8db850ea82a34c4bc5af84c27e7bbcf238..947ba0b21c2912c9a3c3b58bd8ed979116c4a69f 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
diff --git a/lib/chrome_frame.rb b/lib/chrome_frame.rb
index 52a4eb45977bf39c6399b6127f7b1adfa0ea8b03..87d9df65ea199e8e5071af37df0c26e85da284bc 100644
--- a/lib/chrome_frame.rb
+++ b/lib/chrome_frame.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Rack
diff --git a/lib/diaspora.rb b/lib/diaspora.rb
index e8508b38ba0778135a4351bf2a1bd81e6c308fcb..3d06e3e1281da91cf84b5e6f6980ff810d2d08d1 100644
--- a/lib/diaspora.rb
+++ b/lib/diaspora.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/exporter.rb b/lib/diaspora/exporter.rb
index f23ed7681d4096a8676f5498359eac9ed644c13b..b560f729c1f08b27404b41938621a77681ade6a6 100644
--- a/lib/diaspora/exporter.rb
+++ b/lib/diaspora/exporter.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/ostatus_builder.rb b/lib/diaspora/ostatus_builder.rb
index 48db7fd86f9a27c5dbf587e4b02966be3b490248..60a106ac59f5658ded7245d2fdbbcbeb38c2550f 100644
--- a/lib/diaspora/ostatus_builder.rb
+++ b/lib/diaspora/ostatus_builder.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/parser.rb b/lib/diaspora/parser.rb
index e8e7e8a2bfbbf131fca703341ed27235e85098ac..2d002a2c98cd3b03490bf77c4da1a692eb91b966 100644
--- a/lib/diaspora/parser.rb
+++ b/lib/diaspora/parser.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index 61f86a19be2c9fbe20174840b93c96dba9bc3e4e..6b2c26cea4d91d37a30171ba32e8bdceed3cbeb7 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index 7d74df4eda07f5631c30dbb3c8a6afae188ceaae..9b08bd9b8e8e61ea00fef784eb74ab58e8bd449e 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb
index fc241a6d314087b79e6afa509eade45bfd4e1e55..fa1b75e32b9d809410d489023559ac26de2cc8d7 100644
--- a/lib/diaspora/webhooks.rb
+++ b/lib/diaspora/webhooks.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/websocket.rb b/lib/diaspora/websocket.rb
index 10e8bc9c83df666242c5413c262a89dd04c4fe08..09c553e20c86ce30f8ab37c66a16e4c167297ea8 100644
--- a/lib/diaspora/websocket.rb
+++ b/lib/diaspora/websocket.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/encryptable.rb b/lib/encryptable.rb
index 133c051561e73ca1b2179a51584ba05a2dddd170..c293c8257275cc377d7e4617f95b8cc722eb7376 100644
--- a/lib/encryptable.rb
+++ b/lib/encryptable.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
   module Encryptable
diff --git a/lib/encryptor.rb b/lib/encryptor.rb
index e9c4936e1fe1df9fc0900e21a5987edb432926dc..6927b90437b715e8013d009c33bfa363b65d17e3 100644
--- a/lib/encryptor.rb
+++ b/lib/encryptor.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Encryptor
diff --git a/lib/hcard.rb b/lib/hcard.rb
index 041f4d384552c27822ea8a50e1a75f0ec0f8d630..9d318f05a01f4b616ce2d50b11816c7529200bab 100644
--- a/lib/hcard.rb
+++ b/lib/hcard.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module HCard
diff --git a/lib/message_handler.rb b/lib/message_handler.rb
index e3890d94f2afb2e1e17e12d204ed04274f95674d..0d201a9943efdb5f6017ee4758f915d40f0bb7f5 100644
--- a/lib/message_handler.rb
+++ b/lib/message_handler.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class MessageHandler
diff --git a/lib/mongo_mapper/bson_id.rb b/lib/mongo_mapper/bson_id.rb
index 328c69a03b891b414d78e7bc5b0c81541e18b21b..f1e0e99857f2605a67d5d233735b291844277258 100644
--- a/lib/mongo_mapper/bson_id.rb
+++ b/lib/mongo_mapper/bson_id.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class String
diff --git a/lib/mongo_mapper/clear_dev_memory.rb b/lib/mongo_mapper/clear_dev_memory.rb
index d63084765781ed139b8a37cab446ba8273e4c4ec..574c32f7cb53d3a14d5fe499e96953f94db9f1e6 100644
--- a/lib/mongo_mapper/clear_dev_memory.rb
+++ b/lib/mongo_mapper/clear_dev_memory.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module MongoMapper
diff --git a/lib/salmon/salmon.rb b/lib/salmon/salmon.rb
index e7690a578c2a7f8f63ab9b8cb23300c38c684367..728524b4de16b2c7cb88c4fdf029260c99d64397 100644
--- a/lib/salmon/salmon.rb
+++ b/lib/salmon/salmon.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Add URL safe Base64 support
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 82fc6fa9f6e2b2c3a9b5f83c7d1536c2241a4c35..0b82b26a3cef68dcd6380d348007b6deefebd2d8 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 namespace :db do
diff --git a/lib/tasks/generate_session_secret.rake b/lib/tasks/generate_session_secret.rake
index c9fc129de4dbdb7e25243cba27c4e7814784016b..e868d3ebac5ecbd1c4291ab0ae28f12e76a92dcb 100644
--- a/lib/tasks/generate_session_secret.rake
+++ b/lib/tasks/generate_session_secret.rake
@@ -7,7 +7,7 @@ namespace :generate do
   File.open(path, 'w') do |f|
     f.write <<"EOF"
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 54442d71ea8d980447739fde820a38a7f1dd0bb7..47d1a37edc1fd9d0af26cba32fd084936dd09b33 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 begin
diff --git a/script/bootstrap-fedora-diaspora.sh b/pkg/bootstrap-fedora-diaspora.sh
similarity index 100%
rename from script/bootstrap-fedora-diaspora.sh
rename to pkg/bootstrap-fedora-diaspora.sh
diff --git a/pkg/fedora/.bundle/config b/pkg/fedora/.bundle/config
new file mode 100644
index 0000000000000000000000000000000000000000..1c3e2cedfba380644aaa579fb3b6c352222bfb81
--- /dev/null
+++ b/pkg/fedora/.bundle/config
@@ -0,0 +1,5 @@
+--- 
+BUNDLE_FROZEN: "1"
+BUNDLE_DISABLE_SHARED_GEMS: "1"
+BUNDLE_WITHOUT: test:rdoc
+BUNDLE_PATH: vendor/bundle
diff --git a/pkg/fedora/Gemfile.lock.patch b/pkg/fedora/Gemfile.lock.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7b96c043e7fe25d68030b70b83ddb409ee5930e0
--- /dev/null
+++ b/pkg/fedora/Gemfile.lock.patch
@@ -0,0 +1,13 @@
+diff --git a/Gemfile.lock b/Gemfile.lock
+index 8534f58..44d386e 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -258,7 +258,7 @@ DEPENDENCIES
+   autotest
+   bson (= 1.0.7)
+   bson_ext (= 1.0.7)
+-  bundler (= 1.0.0)
++  bundler (>= 1.0.0)
+   capybara (~> 0.3.9)
+   carrierwave!
+   cucumber-rails (= 0.3.2)
diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d5bd23fe94912f8ed47949acb913cd1efa082a11
--- /dev/null
+++ b/pkg/fedora/README.md
@@ -0,0 +1,87 @@
+## Diaspora RPM tools
+
+Creates RPM packages from diaspora git repository.  
+
+An alternative to the capistrano system, providing classic, binary RPM 
+packages for deployment on Fedora 13.
+
+#### Synopsis:
+
+*Prerequisites*: ruby-1.8, rubygem and other packages as described in
+http://github.com/diaspora/diaspora/wiki/Rpm-installation-on-fedora
+
+Create source tarballs like  dist/diaspora-0.0-1010041233_fade4231.tar.gz  
+and dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
+    % ./make-dist.sh source
+    % ./make-dist.sh bundle
+
+Setup links to tarballs from RPM source directory:
+    % ./make-dist.sh links
+
+Build rpms:
+    rpmbuild -ba dist/diaspora.spec
+    rpmbuild -ba dist/diaspora-bundle.spec
+
+Install
+    rpm -U ~/rmpbuild/rpms/i686/diaspora-bundle-0.0-1.1010042345_4343fade43.fc13.i686
+    rpm -U ~/rmpbuild/rpms/noarch/diaspora-0.0-1.1010042345_4343fade43.fc13.noarch
+
+Initiate (as root). 
+    /usr/share/diaspora/diaspora-setup
+
+Start development server:
+    sudo
+    su - diaspora
+    cd master
+    ./script/server
+
+See http://github.com/diaspora/diaspora/wiki/Using-apache for  
+apache/passenger setup. After configuration, start with:
+    /sbin/service diaspora-ws start
+    /sbin/service httpd restart
+
+
+#### Notes
+
+Routines uses last available version from master branch at github. The
+version contains a time stamp and an abbreviated git commit id. If listed
+in filename order, like ls does, latest version will be the last one.
+
+*make-dist links* creates links  also for all files listed in SOURCES.
+Typically, this is patches and secondary sources.
+
+The spec-files in dist/ are patched by ./make_dist.sh source to reference
+correct versions of diaspora and diaspora-bundle. The diaspora-bundle
+is only updated if Gemfile is updated, upgrading diaspora doesn't 
+always require a new diaspora-bundle. Editing spec files should be done
+in this directory, changes in dist/ are lost when doing ./make_dist source.
+
+rpmlint shows many errors, most of which related to that the server
+won't start if the .git directories are not included. Needs investigation.
+
+This has been confirmed to start up and provide basic functionality both using 
+the thin webserver and apache passenger.
+
+#### Implementation
+
+
+'make_dist.sh source'  script checks out latest version of diaspora into the
+ dist/diaspora directory. This content is, after some patches, the diaspora package.
+
+'make-dir.sh bundle' makes a 'bundle install --deployment' in the diaspora dir.
+The resulting bundle is stored in vendor/bundle. This is, after some more 
+patches, the content of diaspora-bundle.
+
+Here is also support for running the diaspora websocket service as a system 
+service through /sbin/service and some install scripts.
+    
+Diaspora files are stored in /usr/share/diaspora, and owned by diaspora. The
+bundle, containing some C extensions, is architecture-dependent and lives
+in /usr/lib[64]/diaspora. Log files are in /var/log/diaspora. Symlinks in
+/usr/share diaspora makes log and bundle available as expected by diaspora app.
+This is more or less as mandated by LSB and Fedora packaging rules.
+ 
+    find /usr/share/diaspora/ -type l -exec ls -l {} \; | awk '{print $9, $10, $11}'
+    /usr/share/diaspora/master/public/uploads -> /var/lib/diaspora/uploads
+    /usr/share/diaspora/master/log -> /var/log/diaspora
+    /usr/share/diaspora/master/vendor/bundle -> /usr/lib/diaspora-bundle/master/vendor/bundle
diff --git a/pkg/fedora/SOURCES b/pkg/fedora/SOURCES
new file mode 100644
index 0000000000000000000000000000000000000000..4b487fdf5d13bec08c60d59d4015df80a98be10f
--- /dev/null
+++ b/pkg/fedora/SOURCES
@@ -0,0 +1,7 @@
+# These files will be linked to %_sourcedir by 'make-dist links'
+.bundle
+diaspora-setup
+diaspora-ws
+Gemfile.patch
+perm-fix.patch
+source-fix.patch
diff --git a/pkg/fedora/diaspora-bundle.spec b/pkg/fedora/diaspora-bundle.spec
new file mode 100644
index 0000000000000000000000000000000000000000..87656f110806602e3f8f8c39466b24d89759a88c
--- /dev/null
+++ b/pkg/fedora/diaspora-bundle.spec
@@ -0,0 +1,209 @@
+%define         git_release     1010040945_a09a6d8
+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | 
+       sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
+Summary:        Rubygem bundle for diaspora
+Name:           diaspora-bundle
+Version:        0.0
+Release:        1.%{git_release}%{?dist}
+License:        AGPLv3 
+Group:          Applications/Communications
+URL:            http://www.joindiaspora.com/
+Vendor:         joindiaspora.com
+Source:         %{name}-%{version}-%{git_release}.tar.gz
+Prefix:         %{_prefix}
+BuildRequires:  git
+Requires:       ruby(abi) = 1.8
+
+%description
+The ruby apps bundled with diaspora, as provided by
+bundle install --deployment and patched for Fedora use.
+
+%package devel
+Summary:   Development files (i. e., sources) for diaspora-bundle
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+
+%description devel
+Source file usede to compile native libraries in diaspora-bundle.
+
+
+
+%prep
+%setup -q -n %{name}-%{version}-%{git_release}
+
+pushd bundle/ruby/1.8/
+    find . -name \*.css -exec  chmod 644 {} \;
+    find . -name \*.js -exec  chmod 644 {} \;
+    find . -name \*.treetop -exec  chmod 644 {} \;
+    find . -name \*.rdoc -exec  chmod 644 {} \;
+    chmod 644 gems/term-ansicolor-1.0.5/CHANGES || :
+    chmod 755 gems/cucumber-rails-0.3.2/templates/install/script/cucumber || :
+    chmod 755 gems/ruby-debug-base-0.10.3/Rakefile || :
+    chmod 644 gems/cucumber-rails-0.3.2/History.txt || :
+    chmod 644 gems/cucumber-rails-0.3.2/templates/install/step_definitions/capybara_steps.rb.erb || :
+    chmod 644 gems/rack-1.2.1/test/cgi/lighttpd.conf || :
+    chmod 644 gems/term-ansicolor-1.0.5/VERSION || :
+    chmod 644 gems/mini_magick-2.1/Rakefile || :
+    chmod 755 gems/linecache-0.43/Rakefile || :
+    chmod 644 gems/ffi-0.6.3/ext/ffi_c/libffi/ltmain.sh || :
+    chmod 644 gems/term-ansicolor-1.0.5/README || :
+    chmod 755 gems/mini_magick-2.1/test/not_an_image.php || :
+    chmod 755 gems/rake-0.8.7/test/data/statusreturn/Rakefile || :
+    chmod 755 gems/ruby-debug-0.10.3/Rakefile || :
+    chmod 644 gems/gherkin-2.2.4/tasks/compile.rake || :
+    chmod 755 gems/rake-0.8.7/test/data/file_creation_task/Rakefile  || :
+    chmod 644 gems/term-ansicolor-1.0.5/Rakefile || :
+    chmod 755 gems/mime-types-1.16/Rakefile || :
+    for f in $(find . -name \*.rb); do
+      sed -i -e '/^#!/d' $f
+      chmod 0644 $f
+    done > /dev/null 2>&1
+    find . -type f -print0 | 
+        xargs --null sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|'
+
+    chmod 755 gems/thin-1.2.7/example/async_chat.ru
+    chmod 755 gems/thin-1.2.7/example/async_tailer.ru
+    chmod 644 gems/i18n-0.4.1/MIT-LICENSE 
+    chmod 755 gems/abstract-1.0.0/abstract.gemspec
+    chmod 644 gems/mini_magick-2.1/MIT-LICENSE
+    chmod 755 gems/thin-1.2.7/lib/thin/controllers/service.sh.erb
+    chmod 644 gems/treetop-1.4.8/spec/compiler/test_grammar.tt
+
+popd
+
+
+%build
+
+pushd bundle/ruby/1.8/
+    test -d gems/gherkin-*/ext && {
+    pushd gems/gherkin-*/ext
+    # Recompile all shared libraries using -O2 optimalization flagcd 
+    for lexer_dir in */ ; do
+        pushd $lexer_dir
+            sed -i 's/ -O0 / -O2 /' extconf.rb
+            # Remove #line lines from C sources
+            sed -i '/^#line/d' *.c
+            CONFIGURE_ARGS="--with-cflags='%{optflags}'" ruby extconf.rb
+            make clean && make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+            make install RUBYARCHDIR="../../lib"
+            mv ../../lib/${lexer_dir%/}.so .
+            pushd  ../../lib
+                ln -sf ../ext/${lexer_dir%/}/${lexer_dir%/}.so .
+            popd
+        popd
+    done
+    popd
+    }
+
+    test -d gems/ffi-0.6.3/lib && {
+    pushd  gems/ffi-0.6.3/lib
+        rm ffi_c.so
+        ln -s ../ext/ffi_c/ffi_c.so .
+    popd
+    }
+
+    pushd  gems/thin-1.2.7/lib
+        rm thin_parser.so
+        ln -s ../ext/thin_parser/thin_parser.so .
+    popd
+
+    pushd gems/bson_ext-1.0.7/ext/bson_ext
+        rm cbson.so
+        ln -s ../cbson/cbson.so .
+    popd
+
+    pushd gems/ruby-debug-base-0.10.3/lib
+        rm ruby_debug.so
+        ln -s ../ext/ruby_debug.so .
+    popd
+
+    #in repo
+    pushd gems/eventmachine-0.12.10/lib
+       rm rubyeventmachine.so
+       rm fastfilereaderext.so
+       ln -s ../ext/rubyeventmachine.so .
+       ln -s ../ext/fastfilereader/fastfilereaderext.so .
+    popd
+
+    pushd gems/bcrypt-ruby-2.1.2/lib
+        rm bcrypt_ext.so
+        ln -s ../ext/mri/bcrypt_ext.so .
+    popd
+
+    # in repo
+    pushd gems/nokogiri-1.4.3.1/lib/nokogiri
+        rm nokogiri.so
+        ln -sf ../../ext/nokogiri/nokogiri.so .
+    popd
+
+    pushd gems/json-1.4.6/ext/json/ext/json/ext
+        rm generator.so
+        ln -s ../../generator/generator.so
+        rm parser.so
+        ln -s ../../parser/parser.so .
+    popd
+
+    #in repo
+    pushd gems/linecache-0.43/lib/
+        rm trace_nums.so
+        ln -s ../ext/trace_nums.so .
+    popd
+
+    pushd bundler/gems/em-http-request-6f66010cda90/lib
+       rm em_buffer.so
+        ln -s ../ext/buffer/em_buffer.so .
+        rm http11_client.so
+        ln -s ../ext/http11_client/http11_client.so .
+    popd
+popd
+
+
+%install
+find . -name .git | xargs rm -rf
+find . -name .gitignore -delete
+find . -name \*.o -delete  || :
+
+test -d bundle/ruby/1.8/gems/selenium-webdriver-0.0.28 && {
+pushd bundle/ruby/1.8/gems/selenium-webdriver-0.0.28/lib/selenium/webdriver/
+%ifarch  %ix86 x86_64
+%ifarch %ix86
+   rm -rf firefox/native/linux/amd64
+%else
+   rm -rf firefox/native/linux/i386
+%endif
+%else
+    rm -rf firefox/native/linux/i386
+    rm -rf firefox/native/linux/amd64
+%endif
+popd
+}
+
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle/master/vendor
+
+cp -ar  bundle $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle/master/vendor
+find  %{buildroot}/%{_libdir}/diaspora-bundle  \
+    -type d  -fprintf dirs '%%%dir "%%p"\n'
+find  -L %{buildroot}/%{_libdir}/diaspora-bundle  \
+    -regextype posix-awk -type f -not -regex '.*[.]c$|.*[.]h$|.*[.]cpp$' -fprintf files '"%%p"\n'
+find  %{buildroot}/%{_libdir}/diaspora-bundle -regextype posix-awk \
+   -type f -regex '.*[.]c$|.*[.]h$|.*[.]cpp$'  -fprintf dev-files '"%%p"\n' 
+sed -i  -e 's|%{buildroot}||' -e 's|//|/|' files dev-files dirs
+cat files >> dirs && cp dirs files 
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+
+%files -f files
+%defattr(-, root, root, 0755)
+%doc  COPYRIGHT Gemfile AUTHORS GNU-AGPL-3.0
+
+%files -f dev-files devel
+%defattr(-, root, root, 0644)
+%doc COPYRIGHT AUTHORS GNU-AGPL-3.0
+
+%changelog
+* Sat Oct 02 2010 Alec Leamas  <leamas.alec@gmail.com>       1.1009271539_08b9aa8
+  - Initial attempt to create a spec file
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
new file mode 100755
index 0000000000000000000000000000000000000000..0df7ceb2fecb095aa65aa16d5fb8a876c23759f9
--- /dev/null
+++ b/pkg/fedora/diaspora-setup
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# Do what's needed to initiate diaspora.
+#
+# See http://github.com/diaspora/diaspora/issues/issue/395
+#
+# Note: This is really sort of prototyping. This should be done in ruby,
+# on a web page.
+
+test $UID = "0" || {
+    echo "You need to be root to do this, giving up"
+    exit 2
+}
+
+cd /usr/share/diaspora/master
+
+if rake db:seed:dev; then
+    echo "Database config OK, new user tom/evankort in place"
+else
+    cat <<- EOF
+
+	Database config failed. You might want to remove all db files with
+	rm -rf /var/lib/mongodb/* and/or resetting the config file by
+	cp config/app_config.yml.example config/app_config.yml before
+	making a new try.
+	EOF
+    exit 1   
+fi
+
+# %attr(0777, diaspora, diaspora) doesn't work in specfile due to umask 022.
+chmod 777 /var/lib/diaspora/uploads
+
+hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml)
+while : ; do
+    echo "Current hostname is \"$hostname\""
+    echo -n "Enter new hostname [$hostname] :"
+    read new_hostname garbage
+    echo -n "Use hostname \"$new_hostname\" (Yes/No) [Yes]? :"
+    read yesno garbage
+    test ${yesno:0:1} = 'y' -o ${yesno:0:1} = 'Y' -o -z "$yesno" && {
+        sed -i "/pod_url:/s/$hostname/$new_hostname/g" config/app_config.yml &&
+            echo "config/app_config.yml updated."
+        break
+    }
+done
+
+
+
+    
+
+
diff --git a/pkg/fedora/diaspora-ws b/pkg/fedora/diaspora-ws
new file mode 100755
index 0000000000000000000000000000000000000000..6208acc1c112b7f7c43d14be94bac5902ba9b7c5
--- /dev/null
+++ b/pkg/fedora/diaspora-ws
@@ -0,0 +1,102 @@
+#!/bin/bash
+#
+#	/etc/rc.d/init.d/diaspora-ws
+#
+# Starts the diaspora websocket server
+#
+# chkconfig: - 80 80
+# description: Diaspora websocket server
+
+### BEGIN INIT INFO
+# Provides: diaspora-ws
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: $remote_fs
+# Should-Stop: $remote_fs
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop Diaspora websocket server
+# Description: The websocket server provides websocket services for
+#              diaspora. 
+### END INIT INFO
+
+# Source function library.
+. /etc/init.d/functions
+
+if [ -f /etc/sysconfig/diaspora-ws -a $UID -eq 0 ]; then
+    . /etc/sysconfig/diaspora-ws
+fi
+
+cd  /usr/share/diaspora
+
+RETVAL=0
+prog="Diaspora websocket server"
+exec="script/websocket_server.rb"
+pidfile="/var/run/diaspora-ws"
+lockfile="/var/lock/subsys/diaspora-ws"
+logfile=/var/log/diaspora-ws.log
+
+[ -n "$OPTIONS" ] && OPTIONS=" $OPTIONS"
+ruby_cmd="ruby -C $PWD $exec$OPTIONS"
+
+start() {
+	[ $UID -eq 0 ] || exit 4
+	[ -f $exec ]   || exit 5
+
+        echo -n $"Starting $prog: "
+	daemon --pidfile $pidfile "$ruby_cmd >>$logfile 2>&1 &"
+	RETVAL=$?
+        echo
+	if test $RETVAL = 0; then
+            touch  $lockfile
+            pgrep -f "$ruby_cmd" > $pidfile || {
+                echo "Warning: cannot find running diaspora-webserver"
+                exit 7
+            }
+        fi
+}
+
+stop() {
+	[ $UID -eq 0 ] || exit 4
+	echo -n $"Stopping $prog: "
+	killproc -p $pidfile $exec
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	echo
+}
+
+#
+#	See how we were called.
+#
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  force-reload|restart)
+	stop
+	sleep 1
+	start
+	RETVAL=$?
+	;;
+  condrestart|try-restart)
+	if [ -f $lockfile ]; then
+	    stop
+	    sleep 3
+	    start
+	fi
+	;;
+  status)
+	status -p $pidfile $exec
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|force-reload|status}"
+	RETVAL=2
+	[ "$1" = 'usage' ] && RETVAL=0
+esac
+
+exit $RETVAL
+
diff --git a/pkg/fedora/diaspora.logconf b/pkg/fedora/diaspora.logconf
new file mode 100644
index 0000000000000000000000000000000000000000..48eca391602e7234fe22397a84f4acb5d6722b0c
--- /dev/null
+++ b/pkg/fedora/diaspora.logconf
@@ -0,0 +1,13 @@
+/var/log/diaspora/*.log {
+       create 755 diaspora apache
+       weekly
+       rotate 10
+       copytruncate
+       delaycompress
+       compress
+       notifempty
+       missingok
+       postrotate
+ 	  ( /sbin/service diaspora-ws condrestart )  >/dev/null 2>&1
+       endscript
+}
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
new file mode 100644
index 0000000000000000000000000000000000000000..318ab95238e47466350949fab5659c22941f2d66
--- /dev/null
+++ b/pkg/fedora/diaspora.spec
@@ -0,0 +1,108 @@
+%global         debug_package %{nil} 
+%define         git_release     HEAD
+
+Summary:        A social network server
+Name:           diaspora
+Version:        0.0.1
+Release:        1.%{git_release}%{?dist}
+License:        AGPLv3 
+Group:          Applications/Communications
+URL:            http://www.joindiaspora.com/
+Vendor:         joindiaspora.com
+Source:         %{name}-%{version}-%{git_release}.tar.gz
+Source1:        diaspora-ws
+Source2:        diaspora-setup
+BuildArch:      noarch
+
+# See http://github.com/diaspora/diaspora/issues/issue/393
+Patch0:         source-fix.patch
+
+BuildRequires:  git
+
+Requires(pre):  shadow-utils
+Requires:       mongodb-server
+Requires:       ruby(abi) = 1.8
+Requires:       diaspora-bundle = %{version}
+
+%description
+A privacy aware, personally controlled, do-it-all and
+open source social network server.
+
+%prep
+%setup -q -n %{name}-%{version}-%{git_release}
+pushd master 
+%patch0 -p1
+
+# See: http://github.com/diaspora/diaspora/issues/issue/392
+git apply %{_sourcedir}/perm-fix.patch
+popd
+find .  -perm /u+x -type f -exec \
+    sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|' {} \; > /dev/null
+
+%build
+rm -rf master/vendor/bundle
+mkdir master/tmp || :
+pushd  master
+    tar cf public/source.tar  --exclude='source.tar' -X .gitignore *
+popd
+
+%pre
+getent group diaspora >/dev/null || groupadd -r diaspora
+getent passwd diaspora >/dev/null ||       \
+    useradd -r -g apache                 \
+    -md /usr/share/diaspora -s /sbin/nologin \
+    -c "Diaspora daemon" diaspora
+exit 0
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
+cp master/README.md .
+mv master/GNU-AGPL-3.0 .
+
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/diaspora
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+sed -i '/^cd /s|.*|cd %{_datadir}/diaspora/master|' diaspora-ws
+cp diaspora-ws $RPM_BUILD_ROOT/etc/init.d
+mkdir -p  $RPM_BUILD_ROOT/etc/logrotate.d
+cp diaspora.logconf  $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
+cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
+cp master/.gitignore $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
+cp diaspora-setup  $RPM_BUILD_ROOT/%{_datadir}/diaspora
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
+
+%post
+rm -f  %{_datadir}/diaspora/master/vendor/bundle
+rm -f  %{_datadir}/diaspora/master/log
+rm -f  %{_datadir}/diaspora/master/public/uploads
+
+ln -s  %{_localstatedir}/log/diaspora \
+        %{_datadir}/diaspora/master/log || :
+ln -s  %{_libdir}/diaspora-bundle/master/vendor/bundle \
+       %{_datadir}/diaspora/master/vendor || :
+ln -s  %{_localstatedir}/lib/diaspora/uploads \
+       %{_datadir}/diaspora/master/public/uploads || :
+/sbin/chkconfig --add  diaspora-ws
+
+%preun
+if [ $1 -eq 0 ] ; then
+    service diaspora-ws stop  >/dev/null 2>&1 || :
+    /sbin/chkconfig --del  diaspora-ws
+fi
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root, 0755)
+%doc  README.md GNU-AGPL-3.0
+%attr(0555, diaspora, diaspora) %{_datadir}/diaspora
+%attr(-, diaspora, diaspora) %{_localstatedir}/log/diaspora
+%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/uploads
+%config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
+%{_sysconfdir}/init.d/diaspora-ws
+
+%changelog
+* Fri Sep 24 2010 Alec Leamas  <leamas.alec@gmail.com>       1.1009280542_859ec2d
+  - Initial attempt to create a spec file
diff --git a/pkg/fedora/make-dist.sh b/pkg/fedora/make-dist.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6d079561888751ec41bf66abe354419b4f067de7
--- /dev/null
+++ b/pkg/fedora/make-dist.sh
@@ -0,0 +1,275 @@
+#!/bin/bash
+
+#Usage: See  function usage() at bottom.
+#
+#
+# Create a diaspora distribution
+#
+# Builds a diaspora distribution containing the application and bundled
+# libraries. Normally checks out latest version of the master branch.
+#
+GIT_REPO='http://github.com/diaspora/diaspora.git'
+RELEASE='HEAD'
+VERSION='0.0'
+
+function git_id
+#
+# Echo package-friendly source id.
+#
+# Usage: git_id [-n] [file or directory]
+#
+{
+    nl="\n"
+    file_or_dir="$PWD"
+    test "$1" = '-n' && { nl=""; shift; }
+    test -n "$1" && file_or_dir="$1"
+    if [ -d $file_or_dir ]; then
+        file=""
+        dir=$file_or_dir
+    else
+        file=$(basename $file_or_dir) 
+        dir=$(dirname $file_or_dir)
+    fi    
+
+    export LANG=C
+    (
+        cd $dir
+        git log -1 --abbrev-commit --date=iso $file |
+        awk  -v nl="$nl" \
+          ' BEGIN         { commit = "" }
+           /^commit/      { if ( commit ==  "") commit = $2 }
+           /^Date:/       { split( $2, d, "-")
+                            split( $3, t, ":")
+                          }
+           END            { printf( "%s%s%s%s%s_%s%s",
+                                substr( d[1],3), d[2], d[3],
+                                t[1], t[2],
+                                commit, nl)
+                          }'
+    )
+}
+
+
+function fix_alphatag()
+#  Patch version on top comment first id line:
+#  Uses %define git_release to get release.
+#* Fri Sep 24 2010 name surname  <email@com>     1.20100925_faf234320
+{
+    dist=$(rpm --eval %dist)
+    awk  -v dist="$dist" -v version="$2"  \
+        ' BEGIN         { done = 0 }
+          /%define/     { if ($2 = "git_release") release = $3 }
+          /^[*]/        { if (done)
+                             print
+                          else
+                          {
+                             gsub( "1[.].*", "")
+                             printf( "%s%s-1.%s%s\n", 
+                                     $0, version, release,dist)
+                             done = 1
+                          }
+                          next
+                        }
+                        { print }' \
+    < $1 > $1.tmp && cp $1.tmp $1 && rm $1.tmp
+}
+
+function fix_bundle_deps
+# usage: fix_bundle_deps <specfile> <version> release
+# Patches Requires:   diaspora-bundle = 0.0-20101021-aefsf323148
+{
+	awk -v vers="$2-$3" \
+		' /Requires:/ { if ($2 == "diaspora-bundle")
+				    printf( "%s	%s = %s\n", $1,$2,vers)
+				else
+				    print				    
+				next
+			       }
+			       { print}' \
+             < $1 > $1.tmp && cp $1.tmp $1 && rm $1.tmp			    
+}
+
+function patch()
+# Patch git_release, Requires: diaspora-bundle and top comment version.
+# Usage: patch VERSION RELEASE
+{
+	sed -e "/^%define/s|HEAD|$2|"                  \
+            -e '/^Version:/s|.*|Version:        '$1'|' \
+                <diaspora.spec >dist/diaspora.spec                              
+	fix_alphatag dist/diaspora.spec $1
+	#mkdir dist/diaspora/tmp || :
+	bundle_id=$(git_id dist/diaspora/Gemfile)
+	fix_bundle_deps  dist/diaspora.spec $1 "1.$bundle_id.fc13"
+	sed -e "/^%define/s|HEAD|$bundle_deps|"        \
+            -e '/^Version:/s|.*|Version:        '$1'|' \
+                < diaspora-bundle.spec > dist/diaspora-bundle.spec
+	
+	cp dist/diaspora.spec dist/diaspora/diaspora.spec
+}
+
+function checkout()
+# Checkout last version of diaspora unless it's already there.
+# Usage: checkout [commit id, defaults to HEAD]
+# Returns: commit for current branch's HEAD.
+{   
+    mkdir dist  >/dev/null 2>&1 || :
+    (
+        cd dist 
+        test -d diaspora || {
+             git clone --quiet $GIT_REPO; 
+             (
+                 cd diaspora;
+                 git remote add upstream \
+                     git://github.com/diaspora/diaspora.git
+             )
+        }
+        cd diaspora; 
+        git fetch --quiet upstream 
+        git merge --quiet upstream/master
+        git checkout --quiet  ${1:-'HEAD'}
+        git_id  -n 
+    )
+}
+
+
+function make_dist
+# Create a distribution tarball
+{
+    commit=$(checkout ${1:-'HEAD'})
+    echo "Creating source tarball for $commit"
+    patch $VERSION $commit 
+	
+    RELEASE_DIR="diaspora-$VERSION-$commit"
+    rm -rf dist/${RELEASE_DIR} 
+    mkdir dist/${RELEASE_DIR}
+    cp diaspora-ws diaspora-setup diaspora.logconf dist/${RELEASE_DIR}
+    cd dist
+    mkdir ${RELEASE_DIR}/master
+    cp -ar diaspora/*  diaspora/.git* ${RELEASE_DIR}/master	
+    cp -r ../.bundle ${RELEASE_DIR}/master
+    mv  ${RELEASE_DIR}/master/diaspora.spec  ${RELEASE_DIR}
+    tar czf ${RELEASE_DIR}.tar.gz  ${RELEASE_DIR} && rm -rf ${RELEASE_DIR}
+    cd ..
+    bundle_id=$(git_id dist/diaspora/Gemfile)
+    echo "Source:           dist/${RELEASE_DIR}.tar.gz"
+    echo "Required bundle:  $bundle_id"
+    echo "Source specfile:  dist/diaspora.spec"
+    echo "Bundle specfile:  dist/diaspora-bundle.spec"
+}
+
+function make_bundle()
+{
+    checkout ${1:-'HEAD'} >/dev/null
+    bundle_id=$(git_id dist/diaspora/Gemfile)
+    bundle_name="diaspora-bundle-$VERSION-$bundle_id"
+    test -e  "dist/$bundle_name.tar.gz" || {
+        echo "Creating bundle $bundle_name"
+       	cd dist
+	    rm -rf $bundle_name 
+	    mkdir -p $bundle_name/bundle
+	    pushd diaspora > /dev/null
+                test -e ../../Gemfile.lock.patch &&
+		    git apply ../../Gemfile.lock.patch > /dev/null 2>&1
+                rm -rf devise.tmp
+                git clone http://github.com/BadMinus/devise.git devise.tmp
+                ( cd devise.tmp; gem build devise.gemspec)
+                gem install --install-dir "../$bundle_name/bundle/ruby/1.8" \
+                            --no-rdoc --no-ri                      \
+                            --ignore-dependencies                  \
+                            devise.tmp/devise-1.1.rc1.gem  &&
+                   rm -rf devise.tmp
+
+	        bundle install --deployment                      \
+                               --path="../$bundle_name/bundle"   \
+                               --without=test rdoc
+
+	        cp AUTHORS Gemfile GNU-AGPL-3.0 COPYRIGHT "../$bundle_name"
+            popd
+            tar czf $bundle_name.tar.gz $bundle_name
+    }
+    echo 
+    echo "Bundle: dist/$bundle_name.tar.gz"
+}
+
+function make_links()
+# Usage: make_links [source commit]
+{
+    dest=$(rpm --eval %_sourcedir)
+    test -z "$dest" && {
+        echo "Can't find RPM source directory, giving up."
+        exit 2
+    }
+    echo "Linking sources to $dest"
+
+    src_commit="$1"
+    test -z "$src_commit" && {
+         src_commit=$(checkout)
+    }
+    src="dist/diaspora-$VERSION-$src_commit.tar.gz"
+    ln -sf $PWD/$src $dest
+
+    bundle_commit=$(git_id dist/diaspora/Gemfile)
+    bundle="dist/diaspora-bundle-$VERSION-$bundle_commit.tar.gz"
+    ln -sf $PWD/$bundle $dest
+
+    for file in $( egrep -v '^#' SOURCES); do
+        ln -sf $PWD/$file $dest/$file
+    done
+
+    cd $dest
+    find . -type l -not -readable -exec rm {} \;
+}
+
+function usage()
+{
+    	cat <<- EOF
+
+		Usage: make_dist [-c commit] <dist|bundle|links>
+
+		-c             Use a given commit, defaults to last checked in.
+		dist           Build a diaspora application tarball.
+		bundle         Build a bundler(1) bundle for diaspora.
+		links          Symlink bundle and source tarballs to rpm source dir.
+		
+		All results are stored in dist/
+	EOF
+}		
+
+
+test "$1" = "-h"  -o $# = 0 && {
+    usage;
+    exit 0
+}
+
+test "$1" = "-c" && {
+    test -z "$2" && {
+        usage;
+        exit 1
+    }
+    commit="$2"
+    shift; shift
+}
+    
+    
+ case $1 in
+ 
+     "bundle")  make_bundle $commit
+                ;;
+
+     'source')  make_dist $commit
+                ;;
+
+     'links')   make_links $commit
+                ;;
+
+     "fix_gemfile")
+                fix_gemfile
+                ;;
+                
+            *)  usage
+                exit 1
+                ;;
+ esac
+ 
+         
+
diff --git a/pkg/fedora/perm-fix.patch b/pkg/fedora/perm-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b6fabed52045cb06043bfb9aa53cb50b2f066f1d
--- /dev/null
+++ b/pkg/fedora/perm-fix.patch
@@ -0,0 +1,120 @@
+diff --git a/public/javascripts/fancybox/blank.gif b/public/javascripts/fancybox/blank.gif
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_close.png b/public/javascripts/fancybox/fancy_close.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_loading.png b/public/javascripts/fancybox/fancy_loading.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_nav_left.png b/public/javascripts/fancybox/fancy_nav_left.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_nav_right.png b/public/javascripts/fancybox/fancy_nav_right.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_e.png b/public/javascripts/fancybox/fancy_shadow_e.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_n.png b/public/javascripts/fancybox/fancy_shadow_n.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_ne.png b/public/javascripts/fancybox/fancy_shadow_ne.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_nw.png b/public/javascripts/fancybox/fancy_shadow_nw.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_s.png b/public/javascripts/fancybox/fancy_shadow_s.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_se.png b/public/javascripts/fancybox/fancy_shadow_se.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_sw.png b/public/javascripts/fancybox/fancy_shadow_sw.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_w.png b/public/javascripts/fancybox/fancy_shadow_w.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_title_left.png b/public/javascripts/fancybox/fancy_title_left.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_title_main.png b/public/javascripts/fancybox/fancy_title_main.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_title_over.png b/public/javascripts/fancybox/fancy_title_over.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_title_right.png b/public/javascripts/fancybox/fancy_title_right.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancybox-x.png b/public/javascripts/fancybox/fancybox-x.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancybox-y.png b/public/javascripts/fancybox/fancybox-y.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancybox.png b/public/javascripts/fancybox/fancybox.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.easing-1.3.pack.js b/public/javascripts/fancybox/jquery.easing-1.3.pack.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.css b/public/javascripts/fancybox/jquery.fancybox-1.3.1.css
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js b/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fileuploader.js b/public/javascripts/fileuploader.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js b/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/jquery.infieldlabel.js b/public/javascripts/jquery.infieldlabel.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/web_socket.js b/public/javascripts/web_socket.js
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/blueprint/src/grid.css b/public/stylesheets/blueprint/src/grid.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/blueprint/src/print.css b/public/stylesheets/blueprint/src/print.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/blueprint/src/reset.css b/public/stylesheets/blueprint/src/reset.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.eot b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.eot
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.ttf b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.ttf
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.woff b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.woff
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/demo.html b/public/stylesheets/brandongrotesque_light/demo.html
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/stylesheet.css b/public/stylesheets/brandongrotesque_light/stylesheet.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/fileuploader.css b/public/stylesheets/fileuploader.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/loading.gif b/public/stylesheets/loading.gif
+old mode 100755
+new mode 100644
diff --git a/pkg/fedora/source-fix.patch b/pkg/fedora/source-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..55dffae43327eb21380ecf5f61c20e777334a18d
--- /dev/null
+++ b/pkg/fedora/source-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/script/server b/script/server
+index da43895..c5357a3 100755
+--- a/script/server
++++ b/script/server
+@@ -7,9 +7,13 @@ then
+     echo "Mongod not started"
+ else
+     mkdir -p -v log/thin/
+-		#force AGPL
+-		tar cf ../_source.tar -X .gitignore *
+-		mv ../_source.tar public/source.tar
++    #force AGPL
++    test -w public -a ! -e  public/source.tar &&
++        tar cf public/source.tar  --exclude='source.tar' -X .gitignore *
++    test -e public/source.tar || {
++        echo "Can't find, or even create, public/source.tar. Giving up"
++        exit 2
++    }
+     bundle exec ruby ./script/websocket_server.rb&
+     bundle exec thin start $@
+ fi
diff --git a/script/ubuntu-setup.bash b/pkg/ubuntu-setup.bash
similarity index 96%
rename from script/ubuntu-setup.bash
rename to pkg/ubuntu-setup.bash
index 666eac818c9039a5cd1c3fe66a9e43d4f1973c84..cbf42c60a99bd4c787d8770f1af04d53c68b7982 100755
--- a/script/ubuntu-setup.bash
+++ b/pkg/ubuntu-setup.bash
@@ -5,7 +5,7 @@
 # This script helps to setup diaspora.
 #
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # USAGE: ./script/ubuntu-setup.bash
@@ -23,10 +23,11 @@ We need to do some actions as an ordinary user. We use sudo where necessary." &&
 # Check if the user has sudo privileges.
 sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; }
 
-# Check if universal repository is enabled
-grep -i universe /etc/apt/sources.list > /dev/null || \
+# Check if universal repository is enabled 
+grep -ie '^deb .*universe' /etc/apt/sources.list > /dev/null || \
     { echo "Please enable universe repository" ; exit 1 ; }
 
+
 # Make sure that we only install the latest version of packages
 sudo apt-get update
 
diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index cb36d394e9b37b9c6af6810bc26e45947bb0cbf4..59ba6e331de0dab018060ade09a76a4acd936251 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -1,5 +1,5 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3.  See
+*   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
 
diff --git a/public/javascripts/image_picker.js b/public/javascripts/image_picker.js
index 1342102eedee38d7997b64a9a16a5d71079cc40c..2692ffee9b5157e663d2670a62ba5cc7e4833cb1 100644
--- a/public/javascripts/image_picker.js
+++ b/public/javascripts/image_picker.js
@@ -1,5 +1,5 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3.  See
+*   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
 
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index 7811fb1a393fa0bfec5c0f73778e75e3502edbb4..d4f72bcbc9a53f416258cfe91af64474ca898f7e 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -1,5 +1,5 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3.  See
+*   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
 
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 1509145dad73a2ad0284ebcb7a23990dc1d16e0f..58264470fc51e782ebdc95e0ee231b0645aaa30c 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -1,5 +1,5 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3.  See
+*   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 225c5ca84e070b58aaa003d553eace8028abb14d..83465d57ed59653d8721be78d9ca6f17f534577c 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1,5 +1,5 @@
 //   Copyright (c) 2010, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3.  See
+//   licensed under the Affero General Public License version 3 or later.  See
 //   the COPYRIGHT file.
 
 
diff --git a/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass
index d7cf4644e56465cdd337134bcdf9ed31323a06ee..c785b8396556e3412a14c314d069e9e5a60228f6 100644
--- a/public/stylesheets/sass/sessions.sass
+++ b/public/stylesheets/sass/sessions.sass
@@ -1,5 +1,5 @@
 //   Copyright (c) 2010, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3.  See
+//   licensed under the Affero General Public License version 3 or later.  See
 //   the COPYRIGHT file.
 
 
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index d3ea77e0e65df8a00f602fa0d20580c31d00d22f..e064b3fcf1a550cc017a8d3c459c66ee6d51d322 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -1,5 +1,5 @@
 //   Copyright (c) 2010, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3.  See
+//   licensed under the Affero General Public License version 3 or later.  See
 //   the COPYRIGHT file.
 
 
diff --git a/script/websocket_server.rb b/script/websocket_server.rb
index dae054f157faf79c1fc07375b45620fd80179df5..65199175e6258e3f06eeebe23dde14171a8f50ea 100644
--- a/script/websocket_server.rb
+++ b/script/websocket_server.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.dirname(__FILE__) + '/../config/environment'
diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
index a8f5f8506b7492cd02443701ecc86a4eb2c235f8..5c53f1909eb21b2eaec3e8f39aa1df0706eb4634 100644
--- a/spec/controllers/albums_controller_spec.rb
+++ b/spec/controllers/albums_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index 2e05b850ccc2b78cf353e6908c2122e887a8bbc1..19bb7bf5d3bc88712cc65095f0c01829951913b8 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/dev_utilities_controller_spec.rb b/spec/controllers/dev_utilities_controller_spec.rb
index c4439c790c87f8a10aad228ebf1ba89416fde9b6..128c754be17743cdc4c771661336e69011e1a494 100644
--- a/spec/controllers/dev_utilities_controller_spec.rb
+++ b/spec/controllers/dev_utilities_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index 4ce6e3e695048b2f8273a0e5885b8579a85ad287..c2af4cc93305aa3a046e0db009874099a02c4343 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index 22e71befb372eb8c725d4718b68d4bf3b4fec718..19c95a70559598f87cd514c4d09fac0240733531 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb
index 905b1611e3b10048a8a2d83efee2564c49185702..37f59a831dca1469fdf6a7b330b9ba32e84ba821 100644
--- a/spec/controllers/sockets_controller_spec.rb
+++ b/spec/controllers/sockets_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 69c4b6df35e5b346fe363e736ea19b3cef6e12f8..502353f6a61761fe750222bc1a1146836306fdd7 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/factories.rb b/spec/factories.rb
index 3444cf9e1f233101cb7f6dd3952c7e404d6fd84c..5e5c32b106d1c5cd9a0d292b77a40d9e5a4ad882 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 #For Guidance
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 459563cffb2b2bef8c01bdec9a4f20217a1894b3..f64ca0b97c60d93e26034e4a5e1a7cd1492e77b6 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/helpers/publics_helper_spec.rb b/spec/helpers/publics_helper_spec.rb
index bc6a5021b4ce596b392a949b15cefa8ef60dcbdb..9b52c30a4707a22358c5276760f299d46c4cd9a1 100644
--- a/spec/helpers/publics_helper_spec.rb
+++ b/spec/helpers/publics_helper_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/helpers/requests_helper_spec.rb b/spec/helpers/requests_helper_spec.rb
index bf99f89d1893b2da25598a03bd9eb583bbeb4054..b21ebabfa3bfc353b9db2bf5eaa7fcc05d62daf0 100644
--- a/spec/helpers/requests_helper_spec.rb
+++ b/spec/helpers/requests_helper_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index d5722fd65aab481b73f713d062632942eabd7872..fede700ad020119cde78a5858af7916f4381bd84 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/exporter_spec.rb b/spec/lib/exporter_spec.rb
index 2831b8ef76c2684fe0b5ebfb52b703ea19b2ef7f..aafb4b13c1c057a41235d5edc8fd3c9bb090a57e 100644
--- a/spec/lib/exporter_spec.rb
+++ b/spec/lib/exporter_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/hcard_spec.rb b/spec/lib/hcard_spec.rb
index 45d7157b9644f6817564da957ade00812ae101a8..fc7bb8af5dc96b33aca5110b081534e6e42c4c5b 100644
--- a/spec/lib/hcard_spec.rb
+++ b/spec/lib/hcard_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb
index ddc8223347e6d1880a44ee1fe03c14faf7905146..3a62bc538e9149b0ad6dd5888255594a797a0b2b 100644
--- a/spec/lib/message_handler_spec.rb
+++ b/spec/lib/message_handler_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/ostatus_builder_spec.rb b/spec/lib/ostatus_builder_spec.rb
index 042bf202b33a6714704cfc953197c1f83bfd593a..8e838a6433085ef20a1d7cadca80afc0c99dc496 100644
--- a/spec/lib/ostatus_builder_spec.rb
+++ b/spec/lib/ostatus_builder_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb
index 40f928c18e3dd42b5cf4bf820070cc94ea9310f8..873d060c614cec4ad52974cc775b7d7d3099bcf4 100644
--- a/spec/lib/salmon_salmon_spec.rb
+++ b/spec/lib/salmon_salmon_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/web_hooks_spec.rb b/spec/lib/web_hooks_spec.rb
index e316817d402c999d9410019982d61fb8d08d2546..3a51ed1ed99c692c1ecfc6c1400fed4749012f2f 100644
--- a/spec/lib/web_hooks_spec.rb
+++ b/spec/lib/web_hooks_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/websocket_spec.rb b/spec/lib/websocket_spec.rb
index 0b76e0f5244e8f52756589822b24ee09a8fc7044..84001fc9fcdcfa572e17bd9b31da89da8088ce14 100644
--- a/spec/lib/websocket_spec.rb
+++ b/spec/lib/websocket_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/misc_spec.rb b/spec/misc_spec.rb
index c4b2cc67c27aee4c18eb27b4cd0e00ef285b5d28..1db3f3f8296862921d3d9327f76bc4179a42882c 100644
--- a/spec/misc_spec.rb
+++ b/spec/misc_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb
index ed13ba102851eee8730e138b6c43b9263e7cc3cc..a47c6026ded1a2480ba1bfa61bffc0b8a3fb3331 100644
--- a/spec/models/album_spec.rb
+++ b/spec/models/album_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb
index 23453eee915af22669da41338a4165947eef705d..6c8a4aef6a0d5bbb09a2a816f2dc4e055e5bc517 100644
--- a/spec/models/aspect_spec.rb
+++ b/spec/models/aspect_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/comments_spec.rb b/spec/models/comments_spec.rb
index 732c4349b25e1754d7558582d72cdb33070c76c9..c46fed5baf23ee41e15b8d96c3215756672c0db9 100644
--- a/spec/models/comments_spec.rb
+++ b/spec/models/comments_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/fb_status_spec.rb b/spec/models/fb_status_spec.rb
index 2ab232fce0fb5e700019dc1e28de27721799bfc7..a575a187347e69591196e44ce821b92b239edcfe 100644
--- a/spec/models/fb_status_spec.rb
+++ b/spec/models/fb_status_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index 6df3ddc1c884ab7b64bec9a0bd48de10ff57f222..67fd1409c2fd1fc64e5f7786975a0cf5a040984d 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index f3f77f3db26f249006a8a50760fee43a678594c5..2a4ac4991d86c0fbe00e8ade8385dbea5ad93beb 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index b0ed59b7d59b066e2c9809b00440c70ca4a3678f..bc445af990234517ca545fbc63ebc90efee2141f 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb
index 2e38c20ae3afec3d561374b78445611263fcf173..7bba8311c87a4c11b4e9b0a6a2599a5839f3e754 100644
--- a/spec/models/profile_spec.rb
+++ b/spec/models/profile_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index c8fb8af0570a4decdadd5b4fe61834ae1bd9d7df..5364ef5f330fd0dd40bc37de18f50d49700520b8 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/retraction_spec.rb b/spec/models/retraction_spec.rb
index 7778552340a923e9db42b4625ee2cfc2758ca393..fd8e3d28a74609b4986fd21e4124b4c412ba386e 100644
--- a/spec/models/retraction_spec.rb
+++ b/spec/models/retraction_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb
index d7dbf19e45af5054b8e0d733b48e4e7e6cd70f29..2d8d0c5bf443e29f472c8796a4894b7875653a43 100644
--- a/spec/models/status_message_spec.rb
+++ b/spec/models/status_message_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb
index 518c03d2d88a13b618860e0256c160ac8e8546c7..563e1473b9c84db4e2aa657da2bb39c9bce7d6fb 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb
index fce699cf68bde0d97e910c7165280a47fff44ca5..c9ec4e207d74845a46e941a052b46d06639986ae 100644
--- a/spec/models/user/receive_spec.rb
+++ b/spec/models/user/receive_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb
index 4ea51ad19e72184ac05aafa4d2f0ee177113a35c..fa4dd53b629b2a207208dd9060cb33f089e1c210 100644
--- a/spec/models/user/user_friending_spec.rb
+++ b/spec/models/user/user_friending_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb
index 040fcd1bc35a372c186d96c9036bac93f1d125fc..c4cf40797f24280e0668f0a2dbf73f9a3e6767b7 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d21b1d57c28ce905b74e13f63efaf5103a853bfe..100b9ff39921e29d810cc49f114fa5bf9c25dc6f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4149200d8ac3a0f7f0bbc9d36e4018e2c669881d..7dede4436b0e8145bb578854eae28ce48056f0b4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index a7fd8c5482ec47a116f61cbaddb33cda386a2a11..f222a7674c77017cc101a86945b8e1def86bec4e 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'