diff --git a/Gemfile b/Gemfile
index 3efc854b..048b235e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "parslet" , :git => 'https://github.com/NigelThorne/parslet.git'
-gem "crystal-reader" , "0.1.0" , :require => "parser" , :git => "https://github.com/ruby-in-ruby/crystal-reader.git" 
+gem "crystal-reader" , "0.1.0" , :require => "parser" , :git => "https://github.com/crystal-vm/crystal-reader.git" 
 
 group :development do
   gem "minitest"
diff --git a/Gemfile.lock b/Gemfile.lock
index fdf42c4c..a55ff13b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
       blankslate (~> 2.0)
 
 GIT
-  remote: https://github.com/ruby-in-ruby/crystal-reader.git
+  remote: https://github.com/crystal-vm/crystal-reader.git
   revision: bc8697c733113b19863df632b546c7eab2b429c0
   specs:
     crystal-reader (0.1.0)
diff --git a/crystal.gemspec b/crystal.gemspec
index 7553ed76..df883649 100644
--- a/crystal.gemspec
+++ b/crystal.gemspec
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.email = 'torsten@villataika.fi'
   s.extra_rdoc_files = ['README.markdown']
   s.files = %w(README.markdown LICENSE.txt Rakefile) + Dir.glob("lib/**/*")
-  s.homepage = 'https://github.com/ruby-in-ruby/crystal'
+  s.homepage = 'https://github.com/crystal-vm/crystal'
   s.license = 'MIT'
   s.require_paths = ['lib']
   s.summary = 'Hey crystal, what do you want to be when you grow up:  I like pink and red, i wanna be a ruby'  
diff --git a/lib/kernel/README.md b/lib/kernel/README.md
index adb4ace8..07288607 100644
--- a/lib/kernel/README.md
+++ b/lib/kernel/README.md
@@ -8,7 +8,7 @@ function.
 A normal ruby function is one that is parsed and transformed to code. But not all functionality can be written in ruby, 
 one of those chicken and egg things. C uses Assembler in this situation, we use Kernel function.
 
-Slightly more here : http://ruby-in-ruby.github.io/2014/06/10/more-clarity.html
+Slightly more here : http://crystal-vm.github.io/2014/06/10/more-clarity.html
 
 The Kernal module is scattered into several files, but that is just so the file doesn't get too long.
 
diff --git a/lib/parfait/README.md b/lib/parfait/README.md
index a12d150a..08dd822d 100644
--- a/lib/parfait/README.md
+++ b/lib/parfait/README.md
@@ -4,4 +4,4 @@ Here we have a placeholder for things i am currently developing.
 
 Basically Parfait is the smallest amount of code needed to make a ruby-like OO system work.
 
-A work in progress that started from here : http://ruby-in-ruby.github.io/2014/06/10/more-clarity.html
+A work in progress that started from here : http://crystal-vm.github.io/2014/06/10/more-clarity.html