diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
old mode 100755
new mode 100644
diff --git a/akka-docs/java/code/akka/docs/agent/AgentDocTest.java b/akka-docs/java/code/akka/docs/agent/AgentDocTest.java
index 94ddef2c9f..553d64eee5 100644
--- a/akka-docs/java/code/akka/docs/agent/AgentDocTest.java
+++ b/akka-docs/java/code/akka/docs/agent/AgentDocTest.java
@@ -44,7 +44,7 @@ public class AgentDocTest {
 
   @Test
   public void createAndClose() {
-  	//#create
+        //#create
     ActorSystem system = ActorSystem.create("app");
 
     Agent<Integer> agent = new Agent<Integer>(5, system);
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala
old mode 100755
new mode 100644
index 72bbffaeb5..dd15817374
--- a/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala
@@ -11,7 +11,7 @@ trait AbstractRemoteActorMultiJvmSpec {
     nodesOpt getOrElse IndexedSeq.fill(NrOfNodes)("localhost")
   }
 
-	def akkaSpec(idx: Int) = "AkkaRemoteSpec@%s:%d".format(remotes(idx), 9991+idx)
+        def akkaSpec(idx: Int) = "AkkaRemoteSpec@%s:%d".format(remotes(idx), 9991+idx)
 
   def akkaURIs(count: Int): String = {
     0 until count map {idx => "\"akka://" + akkaSpec(idx) + "\""} mkString ","
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/Barrier.scala b/akka-remote/src/multi-jvm/scala/akka/remote/Barrier.scala
old mode 100755
new mode 100644
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala b/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala
old mode 100755
new mode 100644
diff --git a/akka-sbt-plugin/sample/src/main/config/logback.xml b/akka-sbt-plugin/sample/src/main/config/logback.xml
index bddac0313d..019d298192 100644
--- a/akka-sbt-plugin/sample/src/main/config/logback.xml
+++ b/akka-sbt-plugin/sample/src/main/config/logback.xml
@@ -9,7 +9,7 @@
 </appender>
 
 <root level="info">
-	<appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT" />
 </root>
 
 </configuration>
diff --git a/akka-transactor/src/test/java/scala/concurrent/stm/JavaAPITests.java b/akka-transactor/src/test/java/scala/concurrent/stm/JavaAPITests.java
index 63fb6abb74..09ed90af7a 100644
--- a/akka-transactor/src/test/java/scala/concurrent/stm/JavaAPITests.java
+++ b/akka-transactor/src/test/java/scala/concurrent/stm/JavaAPITests.java
@@ -27,9 +27,9 @@ public class JavaAPITests {
     public void atomicWithRunnable() {
         final Ref.View<Integer> ref = newRef(0);
         atomic(new Runnable() {
-        	public void run() {
-        		ref.set(10);
-        	}
+                public void run() {
+                        ref.set(10);
+                }
         });
         int value = ref.get();
         assertEquals(10, value);
@@ -39,9 +39,9 @@ public class JavaAPITests {
     public void atomicWithCallable() {
         final Ref.View<Integer> ref = newRef(0);
         int oldValue = atomic(new Callable<Integer>() {
-        	public Integer call() {
-        		return ref.swap(10);
-        	}
+                public Integer call() {
+                        return ref.swap(10);
+                }
         });
         assertEquals(0, oldValue);
         int newValue = ref.get();
@@ -53,10 +53,10 @@ public class JavaAPITests {
         final Ref.View<Integer> ref = newRef(0);
         try {
             atomic(new Runnable() {
-            	public void run() {
-        		    ref.set(10);
-        		    throw new TestException();
-        	    }
+                public void run() {
+                            ref.set(10);
+                            throw new TestException();
+                    }
             });
         } catch (TestException e) {
             int value = ref.get();
@@ -69,9 +69,9 @@ public class JavaAPITests {
     public void transformInteger() {
         Ref.View<Integer> ref = newRef(0);
         transform(ref, new AbstractFunction1<Integer, Integer>() {
-        	public Integer apply(Integer i) {
-        		return i + 10;
-        	}
+                public Integer apply(Integer i) {
+                        return i + 10;
+                }
         });
         int value = ref.get();
         assertEquals(10, value);
@@ -110,13 +110,13 @@ public class JavaAPITests {
         final Map<Integer, String> map = newMap();
         try {
             atomic(new Runnable() {
-            	public void run() {
-        		    map.put(1, "one");
+                public void run() {
+                            map.put(1, "one");
                     map.put(2, "two");
                     assertTrue(map.containsKey(1));
                     assertTrue(map.containsKey(2));
-        		    throw new TestException();
-        	    }
+                            throw new TestException();
+                    }
             });
         } catch (TestException e) {
             assertFalse(map.containsKey(1));