diff --git a/roles/shell/files/shell_aliases b/roles/shell/files/shell_aliases.ansible
similarity index 100%
rename from roles/shell/files/shell_aliases
rename to roles/shell/files/shell_aliases.ansible
diff --git a/roles/shell/files/shell_profile b/roles/shell/files/shell_profile.ansible
similarity index 100%
rename from roles/shell/files/shell_profile
rename to roles/shell/files/shell_profile.ansible
diff --git a/roles/shell/tasks/main.yml b/roles/shell/tasks/main.yml
index aadbd65..5715d6b 100644
--- a/roles/shell/tasks/main.yml
+++ b/roles/shell/tasks/main.yml
@@ -2,5 +2,11 @@
 - name: Copy common shell rc files
   copy: src={{ item.src }} dest={{ item.dest }} backup=true
   with_items:
-    - { src: 'shell_aliases', dest: '~/.shell_aliases' }
-    - { src: 'shell_profile', dest: '~/.shell_profile' }
+    - { src: 'shell_aliases.ansible', dest: '~/.shell_aliases.ansible' }
+    - { src: 'shell_profile.ansible', dest: '~/.shell_profile.ansible' }
+
+- name: Source shell.ansible files
+  lineinfile: path={{ item.path }} line={{ item.line }} create=true insertbefore=BOF
+  with_items:
+    - { path: '~/.shell_aliases', line: '. "$HOME"/.shell_aliases.ansible' }
+    - { path: '~/.shell_profile', line: '. "$HOME"/.shell_profile.ansible' }