diff --git a/.emacs b/.emacs
index 9dcc020..ebc45bd 100644
--- a/.emacs
+++ b/.emacs
@@ -16,6 +16,8 @@
  '(split-width-threshold nil)
  '(tab-width 4)
  '(tool-bar-mode nil)
+ '(vhdl-basic-offset 4)
+ '(vhdl-electric-mode nil)
  '(visible-bell t))
 (custom-set-faces
   ;; custom-set-faces was added by Custom.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index f4ec93f..cc0518a 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -20,7 +20,7 @@
 (local-set-key "\C-k" 'kill-this-buffer)
 (use-global-map global-map)
 
-(setq auto-mode-alist (cons '("\\.cu[h]?$" . c++-mode) (cons '("\\.\\(sdc\\|qsf\\)$" . tcl-mode) auto-mode-alist)))
+(setq auto-mode-alist (cons '("\\.cu[h]?$" . c++-mode) (cons '("\\.\\(sdc\\|qsf\\|qip\\)$" . tcl-mode) auto-mode-alist)))
 
 ;;;
 ;;;