diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb
index 0806ce1f..af6c5e83 100644
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -321,6 +321,14 @@ module Linguist
       end
     end
 
+    disambiguate ".rpy" do |data|
+      if /(^(import|from)[\s\S])/m.match(data)
+        Language["Python"]
+    else
+        Language["Ren'Py"]
+      end
+    end
+
     disambiguate ".rs" do |data|
       if /^(use |fn |mod |pub |macro_rules|impl|#!?\[)/.match(data)
         Language["Rust"]
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e9c63ef1..4a348bc2 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2831,6 +2831,7 @@ Python:
   - .pyp
   - .pyt
   - .pyw
+  - .rpy
   - .tac
   - .wsgi
   - .xpy
@@ -3004,7 +3005,6 @@ Redcode:
 
 Ren'Py:
   type: programming
-  group: Python
   aliases:
   - renpy
   color: "#ff7f7f"
diff --git a/samples/Python/simpleclient.rpy b/samples/Python/simpleclient.rpy
new file mode 100644
index 00000000..ceb5f991
--- /dev/null
+++ b/samples/Python/simpleclient.rpy
@@ -0,0 +1,49 @@
+
+# Copyright (c) Twisted Matrix Laboratories.
+# See LICENSE for details.
+
+
+"""
+An example client. Run simpleserv.py first before running this.
+"""
+
+from twisted.internet import reactor, protocol
+
+
+# a client protocol
+
+class EchoClient(protocol.Protocol):
+    """Once connected, send a message, then print the result."""
+
+    def connectionMade(self):
+        self.transport.write("hello, world!")
+
+    def dataReceived(self, data):
+        "As soon as any data is received, write it back."
+        print "Server said:", data
+        self.transport.loseConnection()
+
+    def connectionLost(self, reason):
+        print "connection lost"
+
+class EchoFactory(protocol.ClientFactory):
+    protocol = EchoClient
+
+    def clientConnectionFailed(self, connector, reason):
+        print "Connection failed - goodbye!"
+        reactor.stop()
+
+    def clientConnectionLost(self, connector, reason):
+        print "Connection lost - goodbye!"
+        reactor.stop()
+
+
+# this connects the protocol to a server running on port 8000
+def main():
+    f = EchoFactory()
+    reactor.connectTCP("localhost", 8000, f)
+    reactor.run()
+
+# this only runs if the module was *not* imported
+if __name__ == '__main__':
+    main()