diff --git a/Procfile b/Procfile
new file mode 100644
index 0000000..555b9c0
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: java -jar server/target/lingo-websocket-server.jar
diff --git a/pom.xml b/pom.xml
index 829057d..bc342cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,20 @@
 	</properties>
 
 	<modules>
-		<module>client</module>
 		<module>client-api</module>
 		<module>common</module>
 		<module>server</module>
 	</modules>
 
+	<profiles>
+		<!-- Prevent client module from building on Heroku -->
+		<!-- Heroku's JDKs are headless -->
+		<profile>
+			<id>javafx</id>
+			<modules>
+				<module>client</module>
+			</modules>
+		</profile>
+	</profiles>
+
 </project>
diff --git a/server/pom.xml b/server/pom.xml
index 9460bb1..a4becfb 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -46,6 +46,17 @@
 					<!-- Add src/main/config to the classpath -->
 					<folders>src/main/config</folders>
 				</configuration>
+				<executions>
+					<!-- Repackage as executable JAR (java -jar) -->
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}</finalName>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/server/src/main/java/lingo/server/LingoServer.java b/server/src/main/java/lingo/server/LingoServer.java
index acc8713..4337da0 100644
--- a/server/src/main/java/lingo/server/LingoServer.java
+++ b/server/src/main/java/lingo/server/LingoServer.java
@@ -7,6 +7,13 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class LingoServer {
 
 	public static void main(String[] args) {
+
+		// Heroku dynamically assigns a port
+		final String webPort = System.getenv("PORT");
+		if (webPort != null && !webPort.isEmpty()) {
+			System.setProperty("server.port", webPort);
+		}
+
 		SpringApplication.run(LingoServer.class, args);
 	}
 
diff --git a/system.properties b/system.properties
new file mode 100644
index 0000000..5e8606c
--- /dev/null
+++ b/system.properties
@@ -0,0 +1 @@
+java.runtime.version=1.8