diff --git a/rstudio-server/defaults/main.yml b/rstudio-server/defaults/main.yml
new file mode 100644
index 00000000..0441c82a
--- /dev/null
+++ b/rstudio-server/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+rstudio_install_server: False
+rstudio_enabled: True
+rstudio_file: rstudio-server-0.99.903-amd64.deb
+rstudio_download_url: 'https://download2.rstudio.org/{{ rstudio_file }}'
+
diff --git a/rstudio-server/tasks/main.yml b/rstudio-server/tasks/main.yml
new file mode 100644
index 00000000..7380afc9
--- /dev/null
+++ b/rstudio-server/tasks/main.yml
@@ -0,0 +1,37 @@
+---
+- block:
+    - name: Install the gdebi tool
+      apt: pkg=gdebi-core state=latest update_cache=yes cache_valid_time=1800
+
+    - name: Download the rstudio server deb package
+      get_url: url='{{ rstudio_download_url }}' dest=/srv/{{ rstudio_file }}
+      register: rstudio_download
+
+    - name: Install the rstudio server package
+      command: gdebi -n -q /srv/{{ rstudio_file }}
+      when: ( rstudio_download | changed )
+
+    - name: Ensure that rstudio server is enabled and running
+      service: name=rstudio-server state=started enabled=yes
+      when: rstudio_enabled
+
+    - name: Ensure that rstudio server is disabled and stopped
+      service: name=rstudio-server state=stopped enabled=no
+      when: not rstudio_enabled
+
+  when: rstudio_install_server
+  tags: [ 'rstudio', 'rstudio_server' ]
+
+
+- block:
+    - name: Ensure that rstudio server is disabled and stopped
+      service: name=rstudio-server state=stopped enabled=no
+
+    - name: Remove the rstudio-server and gdebi packages
+      apt: pkg={{ item }} state=absent
+      with_items:
+        - gdebi
+        - rstudio-server
+
+  when: not rstudio_install_server
+  tags: [ 'rstudio', 'rstudio_server' ]